fix: django 4.2 issues

openedx-unsupported · Oct 5, 2023 · 02c1546 · 02c1546
1 parent b4cda26
commit 02c1546
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 101 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,12 +13,13 @@ jobs:
     name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-20.04
         python-version:
           - 3.8
-        toxenv: [ django32 ]
+        toxenv: [ django32, django42 ]
     steps:
     - uses: actions/checkout@v1
     - name: setup python
@@ -45,7 +46,7 @@ jobs:
         make static
         make validate_translations
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django32'
+      if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
       uses: codecov/codecov-action@v1
       with:
         flags: unittests

diff --git a/Makefile b/Makefile
@@ -57,16 +57,6 @@ $(COMMON_CONSTRAINTS_TXT):
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 
 upgrade: piptools  $(COMMON_CONSTRAINTS_TXT)  ## re-compile requirements .txt files from .in files
-	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/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/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/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/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
-	mv requirements/common_constraints.tmp requirements/common_constraints.txt
 	pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip install -qr requirements/pip.txt

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -14,6 +14,8 @@ async-timeout==4.0.3
     # via redis
 backoff==1.10.0
     # via analytics-python
+backports-zoneinfo==0.2.1
+    # via django
 billiard==3.6.4.0
     # via celery
 celery==4.4.7
@@ -23,25 +25,24 @@ celery==4.4.7
     #   django-user-tasks
 certifi==2023.7.22
     # via requests
-cffi==1.15.1
+cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.2.0
+charset-normalizer==3.3.0
     # via requests
 click==8.1.7
     # via edx-django-utils
 cryptography==41.0.4
     # via
     #   pyjwt
     #   social-auth-core
-defusedxml==0.7.1
+defusedxml==0.8.0rc1
     # via
     #   python3-openid
     #   social-auth-core
 django==3.2.21
     # via
-    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   django-cors-headers
@@ -82,7 +83,7 @@ django-simple-history==3.0.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
-django-storages==1.8
+django-storages==1.10
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -139,7 +140,7 @@ oauthlib==3.2.2
     # via
     #   requests-oauthlib
     #   social-auth-core
-packaging==23.1
+packaging==23.2
     # via drf-yasg
 pbr==5.11.1
     # via stevedore
@@ -166,7 +167,6 @@ pytz==2023.3.post1
     # via
     #   -r requirements/base.in
     #   celery
-    #   django
     #   djangorestframework
     #   drf-yasg
 pyyaml==6.0.1
@@ -215,7 +215,7 @@ typing-extensions==4.8.0
     #   edx-opaque-keys
 uritemplate==4.1.1
     # via drf-yasg
-urllib3==1.26.16
+urllib3==1.26.17
     # via
     #   -c requirements/constraints.txt
     #   requests

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -16,8 +16,9 @@ Django<4.0
 # Version 3.2.0 contains bad arabic translations that will cause validation tests to fail
 django-extensions<3.2.0
 
-# django-storages version 1.9 drops support for boto storage backend.
-django-storages<1.9
+# django-storages version 1.10.1 is major upgrade.
+django-storages==1.10.1
+
 
 # From base.in
 celery<5.0  # version 5.0 drops support for python 3.5

diff --git a/requirements/devstack.txt b/requirements/devstack.txt
@@ -31,7 +31,7 @@ async-timeout==4.0.3
     # via
     #   -r requirements/local.txt
     #   redis
-babel==2.12.1
+babel==2.13.0
     # via
     #   -r requirements/local.txt
     #   pydata-sphinx-theme
@@ -40,6 +40,10 @@ backoff==1.10.0
     # via
     #   -r requirements/local.txt
     #   analytics-python
+backports-zoneinfo==0.2.1
+    # via
+    #   -r requirements/local.txt
+    #   django
 beautifulsoup4==4.12.2
     # via
     #   -r requirements/local.txt
@@ -48,12 +52,12 @@ billiard==3.6.4.0
     # via
     #   -r requirements/local.txt
     #   celery
-boto3==1.28.54
+boto3==1.28.56
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   moto
-botocore==1.31.54
+botocore==1.31.56
     # via
     #   -r requirements/local.txt
     #   boto3
@@ -68,12 +72,12 @@ certifi==2023.7.22
     # via
     #   -r requirements/local.txt
     #   requests
-cffi==1.15.1
+cffi==1.16.0
     # via
     #   -r requirements/local.txt
     #   cryptography
     #   pynacl
-charset-normalizer==3.2.0
+charset-normalizer==3.3.0
     # via
     #   -r requirements/local.txt
     #   requests
@@ -109,7 +113,7 @@ cryptography==41.0.4
     #   social-auth-core
 ddt==1.6.0
     # via -r requirements/local.txt
-defusedxml==0.7.1
+defusedxml==0.8.0rc1
     # via
     #   -r requirements/local.txt
     #   python3-openid
@@ -124,7 +128,6 @@ distlib==0.3.7
     #   virtualenv
 django==3.2.21
     # via
-    #   -c requirements/common_constraints.txt
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   django-cors-headers
@@ -173,7 +176,7 @@ django-simple-history==3.0.0
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/local.txt
-django-storages==1.8
+django-storages==1.10
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
@@ -320,7 +323,7 @@ oauthlib==3.2.2
     #   -r requirements/local.txt
     #   requests-oauthlib
     #   social-auth-core
-packaging==23.1
+packaging==23.2
     # via
     #   -r requirements/local.txt
     #   drf-yasg
@@ -340,7 +343,7 @@ pbr==5.11.1
     # via
     #   -r requirements/local.txt
     #   stevedore
-platformdirs==3.10.0
+platformdirs==3.11.0
     # via
     #   -r requirements/local.txt
     #   pylint
@@ -450,7 +453,6 @@ pytz==2023.3.post1
     #   -r requirements/local.txt
     #   babel
     #   celery
-    #   django
     #   djangorestframework
     #   drf-yasg
 pywatchman==1.4.1
@@ -486,7 +488,7 @@ responses==0.17.0
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   moto
-ruamel-yaml==0.17.32
+ruamel-yaml==0.17.35
     # via
     #   -r requirements/local.txt
     #   ruamel-yaml-base
@@ -496,7 +498,7 @@ ruamel-yaml-base==0.3.2
     # via
     #   -r requirements/local.txt
     #   ruamel-yaml-cmd
-ruamel-yaml-clib==0.2.7
+ruamel-yaml-clib==0.2.8
     # via
     #   -r requirements/local.txt
     #   ruamel-yaml
@@ -506,7 +508,7 @@ ruamel-yaml-convert==0.3.2
     # via
     #   -r requirements/local.txt
     #   ruamel-yaml-cmd
-s3transfer==0.6.2
+s3transfer==0.7.0
     # via
     #   -r requirements/local.txt
     #   boto3
@@ -622,7 +624,7 @@ uritemplate==4.1.1
     # via
     #   -r requirements/local.txt
     #   drf-yasg
-urllib3==1.26.16
+urllib3==1.26.17
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
@@ -638,7 +640,7 @@ virtualenv==20.24.5
     # via
     #   -r requirements/local.txt
     #   tox
-werkzeug==2.3.7
+werkzeug==3.0.0
     # via
     #   -r requirements/local.txt
     #   moto

diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -8,15 +8,15 @@ accessible-pygments==0.0.4
     # via pydata-sphinx-theme
 alabaster==0.7.13
     # via sphinx
-babel==2.12.1
+babel==2.13.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
 beautifulsoup4==4.12.2
     # via pydata-sphinx-theme
 certifi==2023.7.22
     # via requests
-charset-normalizer==3.2.0
+charset-normalizer==3.3.0
     # via requests
 docutils==0.19
     # via
@@ -32,7 +32,7 @@ jinja2==3.1.2
     # via sphinx
 markupsafe==2.1.3
     # via jinja2
-packaging==23.1
+packaging==23.2
     # via
     #   pydata-sphinx-theme
     #   sphinx
@@ -72,7 +72,7 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 typing-extensions==4.8.0
     # via pydata-sphinx-theme
-urllib3==1.26.16
+urllib3==1.26.17
     # via
     #   -c requirements/constraints.txt
     #   requests