feat: add python311 support

openedx · Mar 28, 2024 · a1e54d2 · a1e54d2
1 parent f820b87
commit a1e54d2
Show file tree

Hide file tree

Showing 12 changed files with 220 additions and 621 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 }}
 
@@ -33,7 +33,9 @@ jobs:
       run: export AWS_CONFIG_FILE=/dev/null
 
     - name: Install Dependencies
-      run: pip install -r requirements/ci.txt
+      run:
+        pip install setuptools==69.1.1
+        pip install -r requirements/ci.txt
 
     - name: Install GNU gettext
       run: sudo apt-get install gettext

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -7,12 +7,16 @@
 appdirs==1.4.4
     # via fs
 asgiref==3.7.2
+    # via
+    #   django
+    #   django-simple-history
+backports-zoneinfo==0.2.1
     # via django
 bleach==6.1.0
     # via -r requirements/base.in
-boto3==1.34.44
+boto3==1.34.49
     # via -r requirements/base.in
-botocore==1.34.44
+botocore==1.34.49
     # via
     #   boto3
     #   s3transfer
@@ -30,9 +34,13 @@ code-annotations==1.6.0
     # via edx-toggles
 defusedxml==0.7.1
     # via -r requirements/base.in
+<<<<<<< HEAD
 django==3.2.24
+django==3.2.24
+=======
+django==4.2.10
+>>>>>>> 79d8e6366 (feat: python 3.12 support.)
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/base.in
     #   django-crum
     #   django-model-utils
@@ -47,14 +55,13 @@ django-crum==0.7.9
     # via
     #   edx-django-utils
     #   edx-toggles
+django-model-utils==4.4.0
 django-model-utils==4.4.0
     # via
     #   -r requirements/base.in
     #   edx-submissions
-django-simple-history==3.1.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+django-simple-history==3.5.0
+    # via -r requirements/base.in
 django-waffle==4.1.0
     # via
     #   edx-django-utils
@@ -75,16 +82,12 @@ edx-submissions==3.6.0
     # via -r requirements/base.in
 edx-toggles==5.1.1
     # via -r requirements/base.in
-fs==2.0.18
-    # via
-    #   -c requirements/constraints.txt
-    #   xblock
+fs==2.4.16
+    # via xblock
 html5lib==1.1
     # via -r requirements/base.in
-idna==2.8
-    # via
-    #   -c requirements/constraints.txt
-    #   requests
+idna==3.6
+    # via requests
 jinja2==3.1.3
     # via code-annotations
 jmespath==1.0.1
@@ -98,9 +101,7 @@ jsonfield==3.1.0
 lazy==1.6
     # via -r requirements/base.in
 loremipsum==1.0.5
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+    # via -r requirements/base.in
 lxml==5.1.0
     # via
     #   -r requirements/base.in
@@ -113,11 +114,10 @@ markupsafe==2.1.5
     #   jinja2
     #   mako
     #   xblock
-newrelic==9.6.0
+newrelic==9.7.0
     # via edx-django-utils
-path==13.1.0
+path==16.10.0
     # via
-    #   -c requirements/constraints.txt
     #   edx-i18n-tools
     #   path-py
 path-py==12.5.0
@@ -139,19 +139,16 @@ python-dateutil==2.8.2
     #   -r requirements/base.in
     #   botocore
     #   xblock
+python-slugify==8.0.4
 python-slugify==8.0.4
     # via code-annotations
-python-swiftclient==3.13.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+python-swiftclient==4.4.0
+    # via -r requirements/base.in
 pytz==2024.1
     # via
     #   -r requirements/base.in
-    #   django
     #   djangorestframework
     #   edx-submissions
-    #   fs
     #   xblock
 pyyaml==6.0.1
     # via
@@ -170,17 +167,16 @@ six==1.16.0
     #   fs
     #   html5lib
     #   python-dateutil
-    #   python-swiftclient
 sqlparse==0.4.4
     # via django
-stevedore==5.1.0
+stevedore==5.2.0
     # via
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
 text-unidecode==1.3
     # via python-slugify
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via
     #   asgiref
     #   edx-opaque-keys
@@ -189,9 +185,7 @@ urllib3==1.26.18
     #   botocore
     #   requests
 voluptuous==0.14.2
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+    # via -r requirements/base.in
 web-fragments==2.1.0
     # via xblock
 webencodings==0.5.1

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -35,10 +35,8 @@ filelock==3.13.1
     #   -r requirements/tox.txt
     #   tox
     #   virtualenv
-idna==2.8
-    # via
-    #   -c requirements/constraints.txt
-    #   requests
+idna==3.6
+    # via requests
 packaging==23.2
     # via
     #   -r requirements/tox.txt
@@ -68,7 +66,7 @@ tox==4.13.0
     # via -r requirements/tox.txt
 urllib3==2.2.1
     # via requests
-virtualenv==20.25.0
+virtualenv==20.25.1
     # via
     #   -r requirements/tox.txt
     #   tox
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -1,4 +1,9 @@
 
+
+
+
+
+
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #
@@ -13,9 +18,6 @@
 #  this file from Github directly. It does not require packaging in edx-lint.
 
 
-# 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

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -1,33 +1,3 @@
 # Version constraints for pip-installation.
-
-# Base dependencies
-Django<4.0                      # Stay on the latest LTS release of Django
-fs<=2.0.18                         # Constrained by edx-platform
-loremipsum<2.0.0
-
-python-swiftclient<4.0.0
-voluptuous<1.0.0
-
-# Test dependencies
-ddt==1.0.0                          # Test failures at versions > 1.0.0
-idna<2.9.0                          # moto version moto==1.3.14 requires idna<2.9.0
-fs-s3fs==0.1.8                      # Constrained by edx-platform
-wrapt==1.11.*                       # Constrained by astroid
-freezegun<=0.3.14                   # Test failures on 0.3.15
-# Moto 1.3.15 have build issues
-moto<1.3.15
-# Networkx 2.5 drops support for python 3.5
-networkx<2.5
-
-# path 13.2.0 drops support for Python 3.5
-path<13.2.0
-
-# Needed to resolve requirements between path and tox
-# path only requires >=0.5 but tox requires <2
-# path is defined in base.in so it compiles to the most recent version in base.txt,
-#     and tox comes in in test.in
-importlib-metadata<2
-setuptools<60.0
-
-# incremental upgrade plan.
-django-simple-history<=3.1.1
+# greater version breaking few tests.
+moto<5.0
diff --git a/requirements/docs.txt b/requirements/docs.txt
@@ -20,16 +20,16 @@ charset-normalizer==3.3.2
     # via requests
 colorama==0.4.6
     # via sphinx-autobuild
-docutils==0.17.1
+docutils==0.19
     # via
     #   pydata-sphinx-theme
     #   sphinx
-idna==2.8
-    # via
-    #   -c requirements/constraints.txt
-    #   requests
+idna==3.6
+    # via requests
 imagesize==1.4.1
     # via sphinx
+importlib-metadata==7.0.1
+    # via sphinx
 jinja2==3.1.3
     # via sphinx
 livereload==2.6.3
@@ -40,7 +40,7 @@ packaging==23.2
     # via
     #   pydata-sphinx-theme
     #   sphinx
-pydata-sphinx-theme==0.13.3
+pydata-sphinx-theme==0.14.4
     # via sphinx-book-theme
 pygments==2.17.2
     # via
@@ -57,7 +57,7 @@ snowballstemmer==2.2.0
     # via sphinx
 soupsieve==2.5
     # via beautifulsoup4
-sphinx==4.3.2
+sphinx==6.2.1
     # via
     #   -r requirements/docs.in
     #   pydata-sphinx-theme
@@ -89,10 +89,9 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 tornado==6.4
     # via livereload
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via pydata-sphinx-theme
 urllib3==2.2.1
     # via requests
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools
+zipp==3.17.0
+    # via importlib-metadata
diff --git a/requirements/pip.txt b/requirements/pip.txt
@@ -10,7 +10,5 @@ wheel==0.42.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.0
     # via -r requirements/pip.in
-setuptools==59.8.0
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/pip.in
+setuptools==69.1.1
+    # via -r requirements/pip.in