chore: upgrade Django to 4.2

openedx · Sep 19, 2023 · a623438 · a623438
1 parent 97392f6
commit a623438
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 170 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -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
@@ -16,19 +16,15 @@ backoff==1.10.0
     # via
     #   -r requirements/base.in
     #   analytics-python
-backports-zoneinfo[tzdata]==0.2.1
-    # via
-    #   celery
-    #   kombu
 billiard==4.1.0
     # via celery
-boto3==1.28.39
+boto3==1.28.45
     # via django-ses
-botocore==1.31.39
+botocore==1.31.45
     # via
     #   boto3
     #   s3transfer
-celery==5.3.3
+celery==5.3.4
     # via
     #   -r requirements/base.in
     #   django-celery-results
@@ -65,9 +61,9 @@ defusedxml==0.7.1
     # via
     #   python3-openid
     #   social-auth-core
-django==3.2.20
+django==4.2
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   django-celery-results
     #   django-cors-headers
@@ -116,10 +112,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/base.in
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.in
+django-simple-history==3.3.0
+    # via -r requirements/base.in
 django-waffle==4.0.0
     # via
     #   -r requirements/base.in
@@ -230,10 +224,9 @@ python-slugify==8.0.1
     # via code-annotations
 python3-openid==3.2.0
     # via social-auth-core
-pytz==2023.3
+pytz==2023.3.post1
     # via
     #   -r requirements/base.in
-    #   django
     #   django-ses
     #   djangorestframework
     #   drf-yasg
@@ -271,7 +264,7 @@ six==1.16.0
     #   python-dateutil
 slumber==0.7.1
     # via edx-rest-api-client
-social-auth-app-django==5.2.0
+social-auth-app-django==5.3.0
     # via edx-auth-backends
 social-auth-core==4.4.2
     # via
@@ -292,9 +285,7 @@ typing-extensions==4.7.1
     #   edx-opaque-keys
     #   kombu
 tzdata==2023.3
-    # via
-    #   backports-zoneinfo
-    #   celery
+    # via celery
 unicodecsv==0.14.1
     # via djangorestframework-csv
 uritemplate==4.1.1

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -3,6 +3,11 @@
 # See BOM-2721 for more details.
 # Below is the copied and edited version of common_constraints
 
+# This is a temporary solution to override the real common_constraints.txt
+# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
+# See BOM-2721 for more details.
+# Below is the copied and edited version of common_constraints
+
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -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
@@ -30,29 +30,24 @@ backoff==1.10.0
     # via
     #   -r requirements/validation.txt
     #   analytics-python
-backports-zoneinfo[tzdata]==0.2.1
-    # via
-    #   -r requirements/validation.txt
-    #   celery
-    #   kombu
 billiard==4.1.0
     # via
     #   -r requirements/validation.txt
     #   celery
-boto3==1.28.39
+boto3==1.28.45
     # via
     #   -r requirements/validation.txt
     #   django-ses
-botocore==1.31.39
+botocore==1.31.45
     # via
     #   -r requirements/validation.txt
     #   boto3
     #   s3transfer
-build==0.10.0
+build==1.0.3
     # via
     #   -r requirements/pip-tools.txt
     #   pip-tools
-celery==5.3.3
+celery==5.3.4
     # via
     #   -r requirements/validation.txt
     #   django-celery-results
@@ -104,7 +99,7 @@ code-annotations==1.5.0
     #   -r requirements/validation.txt
     #   edx-lint
     #   edx-toggles
-coverage[toml]==7.3.0
+coverage[toml]==7.3.1
     # via
     #   -r requirements/validation.txt
     #   pytest-cov
@@ -130,9 +125,9 @@ dill==0.3.7
     # via
     #   -r requirements/validation.txt
     #   pylint
-django==3.2.20
+django==4.2
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/validation.txt
     #   django-celery-results
     #   django-cors-headers
@@ -190,10 +185,8 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-ses==3.5.0
     # via -r requirements/validation.txt
-django-simple-history==3.0.0
-    # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/validation.txt
+django-simple-history==3.3.0
+    # via -r requirements/validation.txt
 django-waffle==4.0.0
     # via
     #   -r requirements/validation.txt
@@ -263,7 +256,7 @@ exceptiongroup==1.1.3
     #   pytest
 factory-boy==3.3.0
     # via -r requirements/validation.txt
-faker==19.3.1
+faker==19.6.1
     # via
     #   -r requirements/validation.txt
     #   factory-boy
@@ -275,6 +268,10 @@ idna==3.4
     # via
     #   -r requirements/validation.txt
     #   requests
+importlib-metadata==6.8.0
+    # via
+    #   -r requirements/pip-tools.txt
+    #   build
 inflect==7.0.0
     # via
     #   -r requirements/dev.in
@@ -439,7 +436,7 @@ pyproject-hooks==1.0.0
     # via
     #   -r requirements/pip-tools.txt
     #   build
-pytest==7.4.0
+pytest==7.4.2
     # via
     #   -r requirements/validation.txt
     #   pytest-cov
@@ -465,10 +462,9 @@ python3-openid==3.2.0
     # via
     #   -r requirements/validation.txt
     #   social-auth-core
-pytz==2023.3
+pytz==2023.3.post1
     # via
     #   -r requirements/validation.txt
-    #   django
     #   django-ses
     #   djangorestframework
     #   drf-yasg
@@ -526,7 +522,7 @@ snowballstemmer==2.2.0
     # via
     #   -r requirements/validation.txt
     #   pydocstyle
-social-auth-app-django==5.2.0
+social-auth-app-django==5.3.0
     # via
     #   -r requirements/validation.txt
     #   edx-auth-backends
@@ -567,11 +563,9 @@ tomlkit==0.12.1
 typing-extensions==4.7.1
     # via
     #   -r requirements/validation.txt
-    #   annotated-types
     #   asgiref
     #   astroid
     #   edx-opaque-keys
-    #   faker
     #   inflect
     #   kombu
     #   pydantic
@@ -580,7 +574,6 @@ typing-extensions==4.7.1
 tzdata==2023.3
     # via
     #   -r requirements/validation.txt
-    #   backports-zoneinfo
     #   celery
 unicodecsv==0.14.1
     # via
@@ -615,7 +608,10 @@ wrapt==1.11.2
     #   -r requirements/validation.txt
     #   astroid
 zipp==3.16.2
-    # via -r requirements/validation.txt
+    # via
+    #   -r requirements/pip-tools.txt
+    #   -r requirements/validation.txt
+    #   importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip