Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Upgrading to django4.2 #266

Merged
merged 10 commits into from
Sep 22, 2023
Merged

feat!: Upgrading to django4.2 #266

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
375c7b9
feat!: Upgrading to django4.2
awais786 Sep 17, 2023
2a02664
feat!: dropped django32 support
awais786 Sep 17, 2023
5c08634
chore: Updating Python Requirements
edx-requirements-bot Sep 19, 2023
4507bfa
Merge pull request #267 from edx/jenkins/upgrade-python-requirements-…
awais786 Sep 19, 2023
38d2519
chore: SHA1 is no more supported.
awais786 Sep 22, 2023
6f82590
chore: Update constraints.txt
awais786 Sep 22, 2023
0e692df
chore: Update tox.ini
awais786 Sep 22, 2023
8e1f079
chore: Update django.txt
awais786 Sep 22, 2023
5641db4
chore: Update django.txt
awais786 Sep 22, 2023
3ca458f
chore: Update tox.ini
awais786 Sep 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,7 @@ $(COMMON_CONSTRAINTS_TXT):

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
sed 's/pyjwt\[crypto\]<2.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/social-auth-core<4.0.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/edx-auth-backends<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
sed 's/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
Expand Down
16 changes: 6 additions & 10 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
Expand All @@ -12,9 +12,9 @@ asgiref==3.7.2
# via django
beautifulsoup4==4.11.2
# via wagtail
boto3==1.28.47
boto3==1.28.49
# via -r requirements/base.in
botocore==1.31.47
botocore==1.31.49
# via
# boto3
# s3transfer
Expand All @@ -37,10 +37,8 @@ defusedxml==0.7.1
# python3-openid
# social-auth-core
# willow
django==3.2.21
django==4.2.5
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.in
# django-cors-headers
# django-crum
Expand Down Expand Up @@ -68,7 +66,7 @@ django-crum==0.7.9
# via edx-django-utils
django-extensions==3.2.3
# via -r requirements/base.in
django-filter==23.2
django-filter==23.3
# via wagtail
django-modelcluster==6.0
# via wagtail
Expand Down Expand Up @@ -154,7 +152,7 @@ packaging==23.1
# via drf-yasg
pbr==5.11.1
# via stevedore
pillow==10.0.0
pillow==10.0.1
# via
# pillow-heif
# wagtail
Expand Down Expand Up @@ -188,7 +186,6 @@ python3-openid==3.2.0
pytz==2023.3.post1
# via
# -r requirements/base.in
# django
# django-modelcluster
# djangorestframework
# drf-yasg
Expand Down Expand Up @@ -241,7 +238,6 @@ telepath==0.3.1
# via wagtail
typing-extensions==4.7.1
# via
# annotated-types
# asgiref
# edx-opaque-keys
# inflect
Expand Down
2 changes: 1 addition & 1 deletion requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


# using LTS django version
Django<4.0


# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
Expand Down
3 changes: 0 additions & 3 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@
# This file contains all common constraints for edx-repos
-c common_constraints.txt

# We need to stay on LTS version
Django<3.3
iamsobanjaved marked this conversation as resolved.
Show resolved Hide resolved

edx_rest_api_client==4.0.1 # versions>4.0.1 have backward incompatible changes in timeout handling
19 changes: 7 additions & 12 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
Expand All @@ -25,9 +25,9 @@ beautifulsoup4==4.11.2
# via
# -r requirements/quality.txt
# wagtail
boto3==1.28.47
boto3==1.28.49
# via -r requirements/quality.txt
botocore==1.31.47
botocore==1.31.49
# via
# -r requirements/quality.txt
# boto3
Expand Down Expand Up @@ -93,10 +93,8 @@ distlib==0.3.7
# via
# -r requirements/quality.txt
# virtualenv
django==3.2.21
django==4.2.5
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/quality.txt
# django-cors-headers
# django-crum
Expand Down Expand Up @@ -128,11 +126,11 @@ django-crum==0.7.9
# edx-django-utils
django-debug-toolbar==4.2.0
# via -r requirements/dev.in
django-dynamic-fixture==4.0.0
django-dynamic-fixture==4.0.1
# via -r requirements/quality.txt
django-extensions==3.2.3
# via -r requirements/quality.txt
django-filter==23.2
django-filter==23.3
# via
# -r requirements/quality.txt
# wagtail
Expand Down Expand Up @@ -310,7 +308,7 @@ pbr==5.11.1
# via
# -r requirements/quality.txt
# stevedore
pillow==10.0.0
pillow==10.0.1
# via
# -r requirements/quality.txt
# pillow-heif
Expand Down Expand Up @@ -425,7 +423,6 @@ python3-openid==3.2.0
pytz==2023.3.post1
# via
# -r requirements/quality.txt
# django
# django-modelcluster
# djangorestframework
# drf-yasg
Expand Down Expand Up @@ -530,11 +527,9 @@ tox==3.28.0
typing-extensions==4.7.1
# via
# -r requirements/quality.txt
# annotated-types
# asgiref
# astroid
# edx-opaque-keys
# faker
# inflect
# pydantic
# pydantic-core
Expand Down
2 changes: 1 addition & 1 deletion requirements/django.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
django==3.2.21
django==4.2.5
33 changes: 17 additions & 16 deletions requirements/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should run make upgrade using python 3.8 virtualenv since we haven't updated to Python 3.9 yet.

# by the following command:
#
# make upgrade
Expand Down Expand Up @@ -29,9 +29,9 @@ beautifulsoup4==4.11.2
# via
# -r requirements/test.txt
# wagtail
boto3==1.28.47
boto3==1.28.49
# via -r requirements/test.txt
botocore==1.31.47
botocore==1.31.49
# via
# -r requirements/test.txt
# boto3
Expand Down Expand Up @@ -87,7 +87,7 @@ distlib==0.3.7
# via
# -r requirements/test.txt
# virtualenv
django==3.2.21
django==4.2.5
# via
# -r requirements/test.txt
# django-cors-headers
Expand Down Expand Up @@ -116,11 +116,11 @@ django-crum==0.7.9
# via
# -r requirements/test.txt
# edx-django-utils
django-dynamic-fixture==4.0.0
django-dynamic-fixture==4.0.1
# via -r requirements/test.txt
django-extensions==3.2.3
# via -r requirements/test.txt
django-filter==23.2
django-filter==23.3
# via
# -r requirements/test.txt
# wagtail
Expand Down Expand Up @@ -303,7 +303,7 @@ pbr==5.11.1
# via
# -r requirements/test.txt
# stevedore
pillow==10.0.0
pillow==10.0.1
# via
# -r requirements/test.txt
# pillow-heif
Expand Down Expand Up @@ -408,8 +408,6 @@ python3-openid==3.2.0
pytz==2023.3.post1
# via
# -r requirements/test.txt
# babel
# django
# django-modelcluster
# djangorestframework
# drf-yasg
Expand Down Expand Up @@ -480,17 +478,22 @@ sphinx==5.3.0
# via
# -r requirements/doc.in
# edx-sphinx-theme
sphinxcontrib-applehelp==1.0.4
# sphinxcontrib-applehelp
# sphinxcontrib-devhelp
# sphinxcontrib-htmlhelp
# sphinxcontrib-qthelp
# sphinxcontrib-serializinghtml
sphinxcontrib-applehelp==1.0.7
# via sphinx
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-devhelp==1.0.5
# via sphinx
sphinxcontrib-htmlhelp==2.0.1
sphinxcontrib-htmlhelp==2.0.4
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-qthelp==1.0.6
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
sphinxcontrib-serializinghtml==1.1.9
# via sphinx
sqlparse==0.4.4
# via
Expand Down Expand Up @@ -528,11 +531,9 @@ tox==3.28.0
typing-extensions==4.7.1
# via
# -r requirements/test.txt
# annotated-types
# asgiref
# astroid
# edx-opaque-keys
# faker
# inflect
# pydantic
# pydantic-core
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip-tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
Expand Down
14 changes: 6 additions & 8 deletions requirements/production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# make upgrade
Expand All @@ -20,11 +20,11 @@ beautifulsoup4==4.11.2
# via
# -r requirements/base.txt
# wagtail
boto3==1.28.47
boto3==1.28.49
# via
# -r requirements/base.txt
# -r requirements/production.in
botocore==1.31.47
botocore==1.31.49
# via
# -r requirements/base.txt
# boto3
Expand Down Expand Up @@ -57,7 +57,7 @@ defusedxml==0.7.1
# python3-openid
# social-auth-core
# willow
django==3.2.21
django==4.2.5
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version bumped to 4.2

# via
# -r requirements/base.txt
# django-cors-headers
Expand Down Expand Up @@ -88,7 +88,7 @@ django-crum==0.7.9
# edx-django-utils
django-extensions==3.2.3
# via -r requirements/base.txt
django-filter==23.2
django-filter==23.3
# via
# -r requirements/base.txt
# wagtail
Expand Down Expand Up @@ -217,7 +217,7 @@ pbr==5.11.1
# via
# -r requirements/base.txt
# stevedore
pillow==10.0.0
pillow==10.0.1
# via
# -r requirements/base.txt
# pillow-heif
Expand Down Expand Up @@ -273,7 +273,6 @@ python3-openid==3.2.0
pytz==2023.3.post1
# via
# -r requirements/base.txt
# django
# django-modelcluster
# djangorestframework
# drf-yasg
Expand Down Expand Up @@ -347,7 +346,6 @@ telepath==0.3.1
typing-extensions==4.7.1
# via
# -r requirements/base.txt
# annotated-types
# asgiref
# edx-opaque-keys
# inflect
Expand Down
Loading
Loading