build: adding python3.11 and 3.12 support.

openedx · Mar 26, 2024 · d106847 · d106847
1 parent 72c7f21
commit d106847
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 156 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   quality_and_translations_tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -33,13 +33,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["py38"]
+        python-version: ["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
@@ -79,7 +79,13 @@ jobs:
         with:
           node-version: ${{ env.NODE_VER }}
       - name: Install Dependencies
-        run: make requirements
+        run:
+          # if [ "${{ matrix.python-version }}" == "3.8" ]; then
+          #   pip install pyyaml==5.4.1
+          # elif [ "${{ matrix.python-version }}" == "3.11" ]; then
+          #   pip install pyyaml==6.0.1
+          # fi
+          make requirements
       - name: Install Firefox
         run: |
           sudo apt-get update

diff --git a/requirements/all.txt b/requirements/all.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-asgiref==3.7.2
+asgiref==3.8.1
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
@@ -21,34 +21,30 @@ 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
     #   djangorestframework
-bcrypt==4.1.2
-    # via
-    #   -r requirements/dev.txt
-    #   paramiko
 black==24.3.0
     # via -r requirements/dev.txt
 bleach==6.1.0
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
-boto3==1.34.65
+boto3==1.34.70
     # via
     #   -r requirements/production.txt
     #   django-ses
-botocore==1.34.65
+botocore==1.34.70
     # via
     #   -r requirements/production.txt
     #   boto3
@@ -117,7 +113,6 @@ cryptography==42.0.5
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
-    #   paramiko
     #   pyjwt
     #   social-auth-core
 ddt==1.7.2
@@ -140,10 +135,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.11
     # via
     #   -c requirements/common_constraints.txt
@@ -237,28 +228,14 @@ django-webpack-loader==3.0.1
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
-djangorestframework==3.15.0
+djangorestframework==3.15.1
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   django-rest-swagger
     #   drf-jwt
     #   drf-yasg
     #   edx-drf-extensions
-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
@@ -276,7 +253,7 @@ edx-auth-backends==4.2.0
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
-edx-credentials-themes @ git+https://github.com/openedx/[email protected].7
+edx-credentials-themes @ git+https://github.com/openedx/[email protected].2
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
@@ -333,7 +310,7 @@ exceptiongroup==1.2.0
     #   pytest
 factory-boy==3.3.0
     # via -r requirements/dev.txt
-faker==24.3.0
+faker==24.4.0
     # via
     #   -r requirements/dev.txt
     #   factory-boy
@@ -342,7 +319,7 @@ fastavro==1.9.4
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   openedx-events
-filelock==3.13.1
+filelock==3.13.3
     # via
     #   -r requirements/dev.txt
     #   tox
@@ -397,10 +374,6 @@ jmespath==1.0.1
     #   -r requirements/production.txt
     #   boto3
     #   botocore
-jsonschema==3.2.0
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
 lxml==5.1.0
     # via
     #   -r requirements/dev.txt
@@ -459,16 +432,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.10.0
     # via
     #   -r requirements/dev.txt
@@ -562,7 +530,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
@@ -572,10 +539,6 @@ pyproject-api==1.6.1
     # via
     #   -r requirements/dev.txt
     #   tox
-pyrsistent==0.20.0
-    # via
-    #   -r requirements/dev.txt
-    #   jsonschema
 pytest==8.1.1
     # via
     #   -r requirements/dev.txt
@@ -590,10 +553,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
@@ -616,13 +575,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
@@ -636,8 +593,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
@@ -646,7 +601,7 @@ requests==2.31.0
     #   segment-analytics-python
     #   slumber
     #   social-auth-core
-requests-oauthlib==1.4.0
+requests-oauthlib==2.0.0
     # via
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
@@ -682,14 +637,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
@@ -727,10 +679,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
@@ -743,7 +691,7 @@ tomlkit==0.12.4
     # via
     #   -r requirements/dev.txt
     #   pylint
-tox==4.14.1
+tox==4.14.2
     # via -r requirements/dev.txt
 typing-extensions==4.10.0
     # via
@@ -768,7 +716,6 @@ urllib3==1.26.18
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   botocore
-    #   docker
     #   requests
     #   responses
 virtualenv==20.25.1
@@ -780,10 +727,6 @@ webencodings==0.5.1
     #   -r requirements/dev.txt
     #   -r requirements/production.txt
     #   bleach
-websocket-client==0.59.0
-    # via
-    #   -r requirements/dev.txt
-    #   docker-compose
 xss-utils==0.5.0
     # via
     #   -r requirements/dev.txt

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-asgiref==3.7.2
+asgiref==3.8.1
     # via
     #   django
     #   django-cors-headers
@@ -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
@@ -112,7 +113,7 @@ django-waffle==4.1.0
     #   edx-toggles
 django-webpack-loader==3.0.1
     # via -r requirements/base.in
-djangorestframework==3.15.0
+djangorestframework==3.15.1
     # via
     #   -r requirements/base.in
     #   django-rest-swagger
@@ -127,7 +128,7 @@ edx-ace==1.8.0
     # via -r requirements/base.in
 edx-auth-backends==4.2.0
     # via -r requirements/base.in
-edx-credentials-themes @ git+https://github.com/openedx/[email protected].7
+edx-credentials-themes @ git+https://github.com/openedx/[email protected].2
     # via -r requirements/base.in
 edx-django-release-util==1.3.0
     # via -r requirements/base.in
@@ -242,9 +243,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
@@ -262,7 +262,7 @@ requests==2.31.0
     #   segment-analytics-python
     #   slumber
     #   social-auth-core
-requests-oauthlib==1.4.0
+requests-oauthlib==2.0.0
     # via social-auth-core
 sailthru-client==2.2.3
     # via edx-ace

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -13,8 +13,12 @@
 
 # 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
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