feat: add python312 support

fix: update celery package constraint
openedx-unsupported · Mar 7, 2024 · 8cb6235 · 8cb6235
1 parent f7e9106
commit 8cb6235
Show file tree

Hide file tree

Showing 11 changed files with 297 additions and 91 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,26 +3,24 @@ name: Python CI
 on:
   push:
     branches:
-      - master
+    - master
   pull_request:
     branches:
-      - '**'
+    - '**'
 
 jobs:
   run_tests:
     name: Tests
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os:
-          - ubuntu-20.04
-        python-version:
-          - 3.8
-        toxenv: [ django42 ]
+        os: [ubuntu-20.04]
+        python-version: ['3.8', '3.12']
+        toxenv: [django42]
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64
@@ -45,7 +43,7 @@ jobs:
         make static
         make validate_translations
     - name: Run Coverage
-      if: matrix.python-version == '3.8' && matrix.toxenv=='django42'
+      if: matrix.python-version == '3.12' && matrix.toxenv=='django42'
       uses: codecov/codecov-action@v1
       with:
         flags: unittests

diff --git a/Makefile b/Makefile
@@ -59,8 +59,6 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: piptools  $(COMMON_CONSTRAINTS_TXT)  ## re-compile requirements .txt files from .in files
 	sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
 	mv requirements/common_constraints.tmp requirements/common_constraints.txt
-	sed 's/Django<4.0//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
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-amqp==2.6.1
+amqp==5.2.0
     # via kombu
 analytics-python==1.4.post1
     # via -r requirements/base.in
@@ -17,11 +17,15 @@ 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
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   celery
+    #   django
+    #   kombu
+billiard==4.2.0
     # via celery
-celery==4.4.7
+celery==5.3.6
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -35,7 +39,18 @@ cffi==1.16.0
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
-    # via edx-django-utils
+    # via
+    #   celery
+    #   click-didyoumean
+    #   click-plugins
+    #   click-repl
+    #   edx-django-utils
+click-didyoumean==0.3.0
+    # via celery
+click-plugins==1.1.1
+    # via celery
+click-repl==0.3.0
+    # via celery
 cryptography==42.0.5
     # via
     #   pyjwt
@@ -47,7 +62,6 @@ defusedxml==0.8.0rc2
 django==4.2.11
     # via
     #   -c requirements/common_constraints.txt
-    #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   django-cors-headers
     #   django-crum
@@ -116,7 +130,7 @@ edx-auth-backends==4.2.0
     # via -r requirements/base.in
 edx-django-release-util==1.3.0
     # via -r requirements/base.in
-edx-django-utils==5.10.1
+edx-django-utils==5.11.0
     # via
     #   edx-drf-extensions
     #   edx-rest-api-client
@@ -130,7 +144,7 @@ idna==3.6
     # via requests
 inflection==0.5.1
     # via drf-yasg
-kombu==4.6.11
+kombu==5.3.5
     # via celery
 monotonic==1.6
     # via analytics-python
@@ -146,6 +160,8 @@ packaging==23.2
     # via drf-yasg
 pbr==6.0.0
     # via stevedore
+prompt-toolkit==3.0.43
+    # via click-repl
 psutil==5.9.8
     # via edx-django-utils
 pycparser==2.21
@@ -162,7 +178,9 @@ pymongo==3.13.0
 pynacl==1.5.0
     # via edx-django-utils
 python-dateutil==2.9.0.post0
-    # via analytics-python
+    # via
+    #   analytics-python
+    #   celery
 python-slugify==4.0.1
     # via
     #   -c requirements/constraints.txt
@@ -172,7 +190,6 @@ python3-openid==3.2.0
 pytz==2024.1
     # via
     #   -r requirements/base.in
-    #   celery
     #   djangorestframework
     #   drf-yasg
 pyyaml==6.0.1
@@ -221,13 +238,21 @@ typing-extensions==4.10.0
     # via
     #   asgiref
     #   edx-opaque-keys
+    #   kombu
+tzdata==2024.1
+    # via
+    #   backports-zoneinfo
+    #   celery
 uritemplate==4.1.1
     # via drf-yasg
 urllib3==1.26.18
     # via
     #   -c requirements/constraints.txt
     #   requests
-vine==1.3.0
+vine==5.1.0
     # via
     #   amqp
     #   celery
+    #   kombu
+wcwidth==0.2.13
+    # via prompt-toolkit
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -11,17 +11,14 @@
 # Common constraints for edx repos
 -c common_constraints.txt
 
-# This constraint can be removed once global constraint is updated.
-Django<4.3
-
 # Version 3.2.0 contains bad arabic translations that will cause validation tests to fail
 django-extensions<3.2.0
 
 # 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
+# version being used in edx-platform right now
+celery>=5.2.2,<6.0.0
 
 
 code-annotations>=0.3.1  # Pinned to avoid pyyaml security alerts. (https://github.com/openedx/registrar/pull/42)
@@ -48,3 +45,7 @@ wrapt < 1.14.0
 
 # At the time of adding this, the moto version 4.1.9 requires urllib3<1.27,>=1.25.4
 urllib3<1.27,>=1.25.4
+
+# backports.zoneinfo needed for Python 3.12 + Django 4.2 compatibility
+# Can be removed once requirements have been upgraded with Python>=3.9
+backports.zoneinfo; python_version<'3.9'
diff --git a/requirements/devstack.txt b/requirements/devstack.txt
@@ -12,7 +12,7 @@ alabaster==0.7.13
     # via
     #   -r requirements/local.txt
     #   sphinx
-amqp==2.6.1
+amqp==5.2.0
     # via
     #   -r requirements/local.txt
     #   kombu
@@ -42,24 +42,27 @@ backoff==1.10.0
     # via
     #   -r requirements/local.txt
     #   analytics-python
-backports-zoneinfo==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/local.txt
+    #   celery
     #   django
+    #   kombu
 beautifulsoup4==4.12.3
     # via
     #   -r requirements/local.txt
     #   pydata-sphinx-theme
-billiard==3.6.4.0
+billiard==4.2.0
     # via
     #   -r requirements/local.txt
     #   celery
-boto3==1.34.55
+boto3==1.34.57
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   moto
-botocore==1.34.55
+botocore==1.34.57
     # via
     #   -r requirements/local.txt
     #   boto3
@@ -69,7 +72,7 @@ cachetools==5.3.3
     # via
     #   -r requirements/local.txt
     #   tox
-celery==4.4.7
+celery==5.3.6
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/local.txt
@@ -94,14 +97,30 @@ charset-normalizer==3.3.2
 click==8.1.7
     # via
     #   -r requirements/local.txt
+    #   celery
+    #   click-didyoumean
     #   click-log
+    #   click-plugins
+    #   click-repl
     #   code-annotations
     #   edx-django-utils
     #   edx-lint
+click-didyoumean==0.3.0
+    # via
+    #   -r requirements/local.txt
+    #   celery
 click-log==0.4.0
     # via
     #   -r requirements/local.txt
     #   edx-lint
+click-plugins==1.1.1
+    # via
+    #   -r requirements/local.txt
+    #   celery
+click-repl==0.3.0
+    # via
+    #   -r requirements/local.txt
+    #   celery
 code-annotations==1.6.0
     # via
     #   -c requirements/constraints.txt
@@ -143,7 +162,6 @@ distlib==0.3.8
 django==4.2.11
     # via
     #   -c requirements/common_constraints.txt
-    #   -c requirements/constraints.txt
     #   -r requirements/local.txt
     #   django-cors-headers
     #   django-crum
@@ -228,7 +246,7 @@ edx-auth-backends==4.2.0
     # via -r requirements/local.txt
 edx-django-release-util==1.3.0
     # via -r requirements/local.txt
-edx-django-utils==5.10.1
+edx-django-utils==5.11.0
     # via
     #   -r requirements/local.txt
     #   edx-drf-extensions
@@ -297,7 +315,7 @@ jmespath==1.0.1
     #   -r requirements/local.txt
     #   boto3
     #   botocore
-kombu==4.6.11
+kombu==5.3.5
     # via
     #   -r requirements/local.txt
     #   celery
@@ -372,6 +390,10 @@ polib==1.2.0
     # via
     #   -r requirements/local.txt
     #   edx-i18n-tools
+prompt-toolkit==3.0.43
+    # via
+    #   -r requirements/local.txt
+    #   click-repl
 psutil==5.9.8
     # via
     #   -r requirements/local.txt
@@ -448,6 +470,7 @@ python-dateutil==2.9.0.post0
     #   -r requirements/local.txt
     #   analytics-python
     #   botocore
+    #   celery
     #   faker
     #   freezegun
     #   moto
@@ -467,7 +490,6 @@ pytz==2024.1
     # via
     #   -r requirements/local.txt
     #   babel
-    #   celery
     #   djangorestframework
     #   drf-yasg
 pywatchman==2.0.0
@@ -620,7 +642,7 @@ tomlkit==0.12.4
     # via
     #   -r requirements/local.txt
     #   pylint
-tox==4.13.0
+tox==4.14.1
     # via -r requirements/local.txt
 typing-extensions==4.10.0
     # via
@@ -629,8 +651,14 @@ typing-extensions==4.10.0
     #   astroid
     #   edx-opaque-keys
     #   faker
+    #   kombu
     #   pydata-sphinx-theme
     #   pylint
+tzdata==2024.1
+    # via
+    #   -r requirements/local.txt
+    #   backports-zoneinfo
+    #   celery
 uritemplate==4.1.1
     # via
     #   -r requirements/local.txt
@@ -642,15 +670,20 @@ urllib3==1.26.18
     #   botocore
     #   requests
     #   responses
-vine==1.3.0
+vine==5.1.0
     # via
     #   -r requirements/local.txt
     #   amqp
     #   celery
+    #   kombu
 virtualenv==20.25.1
     # via
     #   -r requirements/local.txt
     #   tox
+wcwidth==0.2.13
+    # via
+    #   -r requirements/local.txt
+    #   prompt-toolkit
 werkzeug==3.0.1
     # via
     #   -r requirements/local.txt