feat: adding python3.11 support.

openedx · May 7, 2024 · 39760f1 · 39760f1
1 parent 8fd2e97
commit 39760f1
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 109 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,11 +9,14 @@ on:
 jobs:
   quality_and_translations_tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.8", "3.11"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: ${{ matrix.python-version }}
           architecture: x64
       - name: Install Dependencies
         run: make requirements
@@ -33,13 +36,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["py38"]
+        python-version: ["3.8", "3.11"]
         django-version: ["django42"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: ${{ matrix.python-version }}
           architecture: x64
       - name: Setup Nodejs Env
         run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
@@ -91,10 +94,11 @@ jobs:
           make static
           make tests
       - name: Run code coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
           flags: unittests
           fail_ci_if_error: true
+          token: ${{secrets.CODECOV_TOKEN}}
 
   docs:
     runs-on: ubuntu-latest

diff --git a/requirements/all.txt b/requirements/all.txt
@@ -21,15 +21,15 @@ attrs==23.2.0
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   edx-ace
-    #   jsonschema
     #   openedx-events
 backoff==2.2.1
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   segment-analytics-python
-backports-zoneinfo==0.2.1
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   django
@@ -117,7 +117,6 @@ cryptography==42.0.7
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
-    #   paramiko
     #   pyjwt
     #   social-auth-core
 ddt==1.7.2
@@ -140,10 +139,6 @@ distlib==0.3.8
     # via
     #   -r requirements/dev.txt
     #   virtualenv
-distro==1.9.0
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
 django==4.2.12
     # via
     #   -c requirements/common_constraints.txt
@@ -250,20 +245,6 @@ dnspython==2.6.1
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   pymongo
-docker[ssh]==7.0.0
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
-docker-compose==1.29.2
-    # via -r requirements/dev.txt
-dockerpty==0.4.1
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
-docopt==0.6.2
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
 drf-jwt==1.19.2
     # via
     #   -r requirements/dev.txt
@@ -406,10 +387,6 @@ jmespath==1.0.1
     #   -r requirements/production.txt
     #   boto3
     #   botocore
-jsonschema==3.2.0
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
 lxml[html-clean]==5.1.1
     # via
     #   -c requirements/constraints.txt
@@ -470,16 +447,11 @@ packaging==24.0
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   black
-    #   docker
     #   drf-yasg
     #   gunicorn
     #   pyproject-api
     #   pytest
     #   tox
-paramiko==3.4.0
-    # via
-    #   -r requirements/dev.txt
-    #   docker
 path==16.14.0
     # via
     #   -r requirements/dev.txt
@@ -573,7 +545,6 @@ pynacl==1.5.0
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   edx-django-utils
-    #   paramiko
 pypng==0.20220715.0
     # via
     #   -r requirements/dev.txt
@@ -601,10 +572,6 @@ python-dateutil==2.9.0.post0
     #   edx-ace
     #   faker
     #   segment-analytics-python
-python-dotenv==0.21.1
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
 python-memcached==1.62
     # via
     #   -r requirements/dev.txt
@@ -627,13 +594,11 @@ pytz==2024.1
     #   drf-yasg
 pywatchman==2.0.0 ; "linux" in sys_platform
     # via -r requirements/dev.txt
-pyyaml==5.4.1
+pyyaml==6.0.1
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   code-annotations
-    #   docker-compose
     #   drf-yasg
     #   edx-django-release-util
     #   edx-i18n-tools
@@ -647,8 +612,6 @@ requests==2.31.0
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   coreapi
-    #   docker
-    #   docker-compose
     #   edx-drf-extensions
     #   edx-rest-api-client
     #   requests-oauthlib
@@ -693,14 +656,11 @@ six==1.16.0
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   bleach
-    #   dockerpty
     #   edx-ace
     #   edx-auth-backends
     #   edx-django-release-util
     #   edx-lint
-    #   jsonschema
     #   python-dateutil
-    #   websocket-client
 slumber==0.7.1
     # via
     #   -r requirements/dev.txt
@@ -738,10 +698,6 @@ text-unidecode==1.3
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   python-slugify
-texttable==1.7.0
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
 tomli==2.0.1
     # via
     #   -r requirements/dev.txt
@@ -778,7 +734,6 @@ urllib3==1.26.18
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   botocore
-    #   docker
     #   requests
     #   responses
 virtualenv==20.26.1

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -15,8 +15,9 @@ attrs==23.2.0
     #   openedx-events
 backoff==2.2.1
     # via segment-analytics-python
-backports-zoneinfo==0.2.1
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   django
     #   djangorestframework
 bleach==6.1.0
@@ -249,9 +250,8 @@ pytz==2024.1
     # via
     #   -r requirements/base.in
     #   drf-yasg
-pyyaml==5.4.1
+pyyaml==6.0.1
     # via
-    #   -c requirements/constraints.txt
     #   code-annotations
     #   drf-yasg
     #   edx-django-release-util

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -11,14 +11,14 @@
 # Common constraints for edx repos
 -c common_constraints.txt
 
-# The update to pyyaml 6.x failed as docker-compose wants <6,>=3.10. Pinning to <6.0. This constraint will be
-# re-evaluated as part of APER-1556.
-pyyaml<6.0
-
 # Pinning urllib3 to versions < 2.x as this conflicts with boto. This constraint will be re-evaluated as part of
 # APER-2422
 urllib3<2
 
+
+# Temporary to Support the python 3.11 Upgrade
+backports.zoneinfo;python_version<"3.9"  # Newer versions have zoneinfo available in the standard library
+
 # Pinning lxml to < 5.2 as edx-i18n-tools package needs to be updated.
 # Release notes: https://pypi.org/project/lxml/5.2.0/
 # Github issue: https://github.com/openedx/i18n-tools/issues/144

diff --git a/requirements/dev.in b/requirements/dev.in
@@ -11,8 +11,6 @@
 # i18n
 edx-i18n-tools
 
-# for docker devstack
-docker-compose
 
 # More efficient checking for runserver reload trigger events
 pywatchman; "linux" in sys_platform