build: make upgrade for latest version of Django

edx · Dec 5, 2023 · bc285cc · bc285cc
1 parent a595593
commit bc285cc
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 62 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -16,6 +16,8 @@ attrs==23.1.0
     # via
     #   lti-consumer-xblock
     #   openedx-events
+backports-zoneinfo==0.2.1
+    # via django
 bleach==6.1.0
     # via lti-consumer-xblock
 boto3==1.33.1
@@ -52,9 +54,9 @@ defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
-django==3.2.23
+django==4.2.8
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   django-appconf
     #   django-config-models
@@ -267,7 +269,6 @@ python3-openid==3.2.0
 pytz==2023.3.post1
     # via
     #   -r requirements/base.in
-    #   django
     #   djangorestframework
     #   drf-yasg
     #   xblock

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -22,7 +22,6 @@ packaging==23.2
     #   tox
 platformdirs==3.11.0
     # via
-    #   -c requirements/common_constraints.txt
     #   tox
     #   virtualenv
 pluggy==1.3.0

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -1,3 +1,7 @@
+# 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.
@@ -14,16 +18,11 @@
 
 
 # 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
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 
-
-# virtualenv latest version requires platformdirs<4.0 which conflicts with tox>4.0 version
-# This constraint can be removed once the issue 
-# https://github.com/pypa/virtualenv/issues/2666 gets resolved 
-platformdirs<4.0
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -27,6 +27,10 @@ attrs==23.1.0
     #   -r requirements/validation.txt
     #   lti-consumer-xblock
     #   openedx-events
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/validation.txt
+    #   django
 bleach==6.1.0
     # via
     #   -r requirements/validation.txt
@@ -106,7 +110,6 @@ cryptography==41.0.7
     # via
     #   -r requirements/validation.txt
     #   pyjwt
-    #   secretstorage
     #   social-auth-core
 ddt==1.7.0
     # via -r requirements/validation.txt
@@ -125,7 +128,7 @@ distlib==0.3.7
     # via
     #   -r requirements/validation.txt
     #   virtualenv
-django==3.2.23
+django==4.2.8
     # via
     #   -r requirements/validation.txt
     #   django-appconf
@@ -335,11 +338,6 @@ jaraco-classes==3.3.0
     # via
     #   -r requirements/validation.txt
     #   keyring
-jeepney==0.8.0
-    # via
-    #   -r requirements/validation.txt
-    #   keyring
-    #   secretstorage
 jinja2==3.1.2
     # via
     #   -r requirements/validation.txt
@@ -570,7 +568,6 @@ python3-openid==3.2.0
 pytz==2023.3.post1
     # via
     #   -r requirements/validation.txt
-    #   django
     #   djangorestframework
     #   drf-yasg
     #   xblock
@@ -626,10 +623,6 @@ s3transfer==0.8.0
     # via
     #   -r requirements/validation.txt
     #   boto3
-secretstorage==3.3.3
-    # via
-    #   -r requirements/validation.txt
-    #   keyring
 semantic-version==2.10.0
     # via
     #   -r requirements/validation.txt

diff --git a/requirements/django.txt b/requirements/django.txt
@@ -1 +1 @@
-django==3.2.23
+django==4.2.8
diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -31,6 +31,10 @@ attrs==23.1.0
     #   openedx-events
 babel==2.13.1
     # via sphinx
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/test.txt
+    #   django
 bleach==6.1.0
     # via
     #   -r requirements/test.txt
@@ -105,7 +109,6 @@ cryptography==41.0.7
     # via
     #   -r requirements/test.txt
     #   pyjwt
-    #   secretstorage
     #   social-auth-core
 ddt==1.7.0
     # via -r requirements/test.txt
@@ -122,9 +125,9 @@ distlib==0.3.7
     # via
     #   -r requirements/test.txt
     #   virtualenv
-django==3.2.23
+django==4.2.8
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   django-appconf
     #   django-config-models
@@ -330,10 +333,6 @@ itypes==1.2.0
     #   coreapi
 jaraco-classes==3.3.0
     # via keyring
-jeepney==0.8.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.1.2
     # via
     #   -r requirements/test.txt
@@ -433,7 +432,6 @@ pkginfo==1.9.6
     # via twine
 platformdirs==3.11.0
     # via
-    #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
     #   pylint
     #   tox
@@ -540,7 +538,6 @@ pytz==2023.3.post1
     # via
     #   -r requirements/test.txt
     #   babel
-    #   django
     #   djangorestframework
     #   drf-yasg
     #   xblock
@@ -590,8 +587,6 @@ s3transfer==0.8.0
     # via
     #   -r requirements/test.txt
     #   boto3
-secretstorage==3.3.3
-    # via keyring
 semantic-version==2.10.0
     # via
     #   -r requirements/test.txt

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -22,6 +22,10 @@ attrs==23.1.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   openedx-events
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/base.txt
+    #   django
 bleach==6.1.0
     # via
     #   -r requirements/base.txt
@@ -77,7 +81,7 @@ defusedxml==0.8.0rc2
     #   -r requirements/base.txt
     #   python3-openid
     #   social-auth-core
-django==3.2.23
+django==4.2.8
     # via
     #   -r requirements/base.txt
     #   django-appconf
@@ -373,7 +377,6 @@ python3-openid==3.2.0
 pytz==2023.3.post1
     # via
     #   -r requirements/base.txt
-    #   django
     #   django-ses
     #   djangorestframework
     #   drf-yasg

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -27,6 +27,10 @@ attrs==23.1.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   openedx-events
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/test.txt
+    #   django
 bleach==6.1.0
     # via
     #   -r requirements/test.txt
@@ -99,7 +103,6 @@ cryptography==41.0.7
     # via
     #   -r requirements/test.txt
     #   pyjwt
-    #   secretstorage
     #   social-auth-core
 ddt==1.7.0
     # via -r requirements/test.txt
@@ -116,9 +119,9 @@ distlib==0.3.7
     # via
     #   -r requirements/test.txt
     #   virtualenv
-django==3.2.23
+django==4.2.8
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   django-appconf
     #   django-config-models
@@ -315,10 +318,6 @@ itypes==1.2.0
     #   coreapi
 jaraco-classes==3.3.0
     # via keyring
-jeepney==0.8.0
-    # via
-    #   keyring
-    #   secretstorage
 jinja2==3.1.2
     # via
     #   -r requirements/test.txt
@@ -415,7 +414,6 @@ pkginfo==1.9.6
     # via twine
 platformdirs==3.11.0
     # via
-    #   -c requirements/common_constraints.txt
     #   -r requirements/test.txt
     #   pylint
     #   tox
@@ -521,7 +519,6 @@ python3-openid==3.2.0
 pytz==2023.3.post1
     # via
     #   -r requirements/test.txt
-    #   django
     #   djangorestframework
     #   drf-yasg
     #   xblock
@@ -568,8 +565,6 @@ s3transfer==0.8.0
     # via
     #   -r requirements/test.txt
     #   boto3
-secretstorage==3.3.3
-    # via keyring
 semantic-version==2.10.0
     # via
     #   -r requirements/test.txt

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -26,6 +26,10 @@ attrs==23.1.0
     #   -r requirements/base.txt
     #   lti-consumer-xblock
     #   openedx-events
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/base.txt
+    #   django
 bleach==6.1.0
     # via
     #   -r requirements/base.txt
@@ -103,7 +107,7 @@ dill==0.3.7
 distlib==0.3.7
     # via virtualenv
     # via
-    #   -c requirements/common_constraints.txt
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   django-appconf
     #   django-config-models
@@ -360,7 +364,6 @@ pbr==6.0.0
     #   stevedore
 platformdirs==3.11.0
     # via
-    #   -c requirements/common_constraints.txt
     #   pylint
     #   tox
     #   virtualenv
@@ -447,7 +450,6 @@ python3-openid==3.2.0
 pytz==2023.3.post1
     # via
     #   -r requirements/base.txt
-    #   django
     #   djangorestframework
     #   drf-yasg
     #   xblock

diff --git a/requirements/validation.txt b/requirements/validation.txt
@@ -32,6 +32,11 @@ attrs==23.1.0
     #   -r requirements/test.txt
     #   lti-consumer-xblock
     #   openedx-events
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/quality.txt
+    #   -r requirements/test.txt
+    #   django
 bleach==6.1.0
     # via
     #   -r requirements/quality.txt
@@ -120,7 +125,6 @@ cryptography==41.0.7
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
     #   pyjwt
-    #   secretstorage
     #   social-auth-core
 ddt==1.7.0
     # via
@@ -142,7 +146,7 @@ distlib==0.3.7
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
     #   virtualenv
-django==3.2.23
+django==4.2.8
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
@@ -404,11 +408,6 @@ jaraco-classes==3.3.0
     # via
     #   -r requirements/quality.txt
     #   keyring
-jeepney==0.8.0
-    # via
-    #   -r requirements/quality.txt
-    #   keyring
-    #   secretstorage
 jinja2==3.1.2
     # via
     #   -r requirements/quality.txt
@@ -670,7 +669,6 @@ pytz==2023.3.post1
     # via
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
-    #   django
     #   djangorestframework
     #   drf-yasg
     #   xblock
@@ -732,10 +730,6 @@ s3transfer==0.8.0
     #   -r requirements/quality.txt
     #   -r requirements/test.txt
     #   boto3
-secretstorage==3.3.3
-    # via
-    #   -r requirements/quality.txt
-    #   keyring
 semantic-version==2.10.0
     # via
     #   -r requirements/quality.txt