feat: add python 311 support

openedx · Mar 28, 2024 · a23cd74 · a23cd74
1 parent 733af7d
commit a23cd74
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,14 +15,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
+        python-version: ['3.8', '3.11']
         node-version: [16]
-        toxenv: [quality, js, django32, django42]
+        toxenv: [quality, js, django42]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: setup python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,6 +8,8 @@ appdirs==1.4.4
     # via fs
 asgiref==3.8.1
     # via django
+backports-zoneinfo==0.2.1
+    # via django
 bleach==6.1.0
     # via -r requirements/base.in
 boto3==1.34.72
@@ -30,7 +32,7 @@ code-annotations==1.7.0
     # via edx-toggles
 defusedxml==0.7.1
     # via -r requirements/base.in
-django==3.2.25
+django==4.2.11
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -148,7 +150,6 @@ python-swiftclient==3.13.1
 pytz==2024.1
     # via
     #   -r requirements/base.in
-    #   django
     #   djangorestframework
     #   edx-submissions
     #   fs
@@ -201,7 +202,9 @@ webencodings==0.5.1
 webob==1.8.7
     # via xblock
 xblock==1.10.0
-    # via -r requirements/base.in
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -1,7 +1,7 @@
 # Version constraints for pip-installation.
 
 # Base dependencies
-Django<4.0                      # Stay on the latest LTS release of Django
+Django<4.3                         # Stay on the latest LTS release of Django
 fs<=2.0.18                         # Constrained by edx-platform
 loremipsum<2.0.0
 

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -47,6 +47,7 @@ backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/test.txt
     #   celery
+    #   django
     #   kombu
 billiard==4.2.0
     # via
@@ -167,7 +168,7 @@ distlib==0.3.8
     # via
     #   -r requirements/test.txt
     #   virtualenv
-django==3.2.25
+django==4.2.11
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt
@@ -519,7 +520,6 @@ python-swiftclient==3.13.1
 pytz==2024.1
     # via
     #   -r requirements/test.txt
-    #   django
     #   djangorestframework
     #   edx-submissions
     #   fs
@@ -707,6 +707,7 @@ wrapt==1.11.2
     #   aws-xray-sdk
 xblock==1.10.0
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   xblock-sdk
 xblock-sdk==0.7.0

diff --git a/requirements/test-acceptance.txt b/requirements/test-acceptance.txt
@@ -43,6 +43,7 @@ backports-zoneinfo[tzdata]==0.2.1
     # via
     #   -r requirements/test.txt
     #   celery
+    #   django
     #   kombu
 billiard==4.2.0
     # via
@@ -157,7 +158,7 @@ distlib==0.3.8
     # via
     #   -r requirements/test.txt
     #   virtualenv
-django==3.2.25
+django==4.2.11
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt
@@ -489,7 +490,6 @@ python-swiftclient==3.13.1
 pytz==2024.1
     # via
     #   -r requirements/test.txt
-    #   django
     #   djangorestframework
     #   edx-submissions
     #   fs
@@ -671,6 +671,7 @@ wrapt==1.11.2
     #   aws-xray-sdk
 xblock==1.10.0
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   xblock-sdk
 xblock-sdk==0.7.0

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -30,7 +30,9 @@ aws-xray-sdk==2.13.0
     # via moto
 backports-zoneinfo[tzdata]==0.2.1
     # via
+    #   -r requirements/base.txt
     #   celery
+    #   django
     #   kombu
 billiard==4.2.0
     # via celery
@@ -389,7 +391,6 @@ python-swiftclient==3.13.1
 pytz==2024.1
     # via
     #   -r requirements/base.txt
-    #   django
     #   djangorestframework
     #   edx-submissions
     #   fs
@@ -543,6 +544,7 @@ wrapt==1.11.2
     #   aws-xray-sdk
 xblock==1.10.0
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   xblock-sdk
 xblock-sdk==0.7.0

diff --git a/setup.py b/setup.py
@@ -63,13 +63,13 @@ def get_version(*file_paths):
     long_description_content_type='text/x-rst',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
-        'Framework :: Django :: 3.2',
         'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: GNU Affero General Public License v3',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.11',
     ],
     packages=find_packages(include=['openassessment*'], exclude=['*.test', '*.tests']),
     include_package_data=True,

diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,9 @@
 [tox]
-envlist = py38-django{32, 42}, js, quality
+envlist = py{38, 311}-django{42}, js, quality
 
 [testenv]
 deps =
     -rrequirements/test.txt
-    django32: Django>=3.2,<4.0
     django42: Django>=4.2,<5.0
 
 commands =