Merge pull request #156 from mariajgrimaldi/MJG/python311-support

build: add support for python 3.11 and 3.12 and vendor upstream code

.github/workflows/ci.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        python-version: ['3.8']
-        toxenv: [django32, django42]
+        python-version: ['3.8', '3.11', '3.12']
+        toxenv: ['django42']
 
     steps:
     - uses: actions/checkout@v1

requirements/base.in

@@ -5,5 +5,4 @@
 
 django
 babel>=1.3
-markey>=0.8,<0.9
 enmerkar==0.7.1

requirements/base.txt

@@ -4,13 +4,17 @@
 #
 #    make upgrade
 #
-asgiref==3.7.2
+asgiref==3.8.1
     # via django
 babel==2.14.0
     # via
     #   -r requirements/base.in
     #   enmerkar
-django==3.2.24
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   django
+django==4.2.11
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -20,10 +24,8 @@ enmerkar==0.7.1
 markey==0.8
     # via -r requirements/base.in
 pytz==2024.1
-    # via
-    #   babel
-    #   django
-sqlparse==0.4.4
+    # via babel
+sqlparse==0.5.0
     # via django
-typing-extensions==4.9.0
+typing-extensions==4.11.0
     # via asgiref

requirements/constraints.txt

@@ -10,3 +10,7 @@
 
 # Common constraints for edx repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+
+
+# Temporary to Support the python 3.11 Upgrade
+backports.zoneinfo;python_version<"3.9"  # Newer versions have zoneinfo available in the standard library

requirements/dev.txt

@@ -6,23 +6,27 @@
 #
 alabaster==0.7.13
     # via sphinx
-asgiref==3.7.2
+asgiref==3.8.1
     # via django
 babel==2.14.0
     # via
     #   -r requirements/base.in
     #   enmerkar
     #   sphinx
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   django
 certifi==2024.2.2
     # via requests
 charset-normalizer==3.3.2
     # via requests
-coverage[toml]==7.4.2
+coverage[toml]==7.5.0
     # via
     #   -r requirements/test.in
     #   pytest-cov
     #   python-coveralls
-django==3.2.24
+django==4.2.11
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -31,18 +35,20 @@ docutils==0.20.1
     # via sphinx
 enmerkar==0.7.1
     # via -r requirements/base.in
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via pytest
-execnet==2.0.2
+execnet==2.1.1
     # via pytest-cache
 flake8==7.0.0
     # via -r requirements/test.in
-idna==3.6
+idna==3.7
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.1
-    # via sphinx
+importlib-metadata==6.11.0
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   sphinx
 iniconfig==2.0.0
     # via pytest
 jinja2==3.1.3
@@ -53,13 +59,13 @@ markupsafe==2.1.5
     # via jinja2
 mccabe==0.7.0
     # via flake8
-packaging==23.2
+packaging==24.0
     # via
     #   pytest
     #   sphinx
 pep8==1.7.1
     # via pytest-pep8
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
 pycodestyle==2.11.1
     # via flake8
@@ -69,7 +75,7 @@ pyflakes==3.2.0
     #   pytest-flakes
 pygments==2.17.2
     # via sphinx
-pytest==8.0.1
+pytest==8.1.1
     # via
     #   -r requirements/test.in
     #   pytest-cache
@@ -78,7 +84,7 @@ pytest==8.0.1
     #   pytest-pep8
 pytest-cache==1.0
     # via pytest-pep8
-pytest-cov==4.1.0
+pytest-cov==5.0.0
     # via -r requirements/test.in
 pytest-flakes==4.0.5
     # via -r requirements/test.in
@@ -87,9 +93,7 @@ pytest-pep8==1.0.6
 python-coveralls==2.9.3
     # via -r requirements/test.in
 pytz==2024.1
-    # via
-    #   babel
-    #   django
+    # via babel
 pyyaml==6.0.1
     # via python-coveralls
 requests==2.31.0
@@ -114,15 +118,15 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-sqlparse==0.4.4
+sqlparse==0.5.0
     # via django
 tomli==2.0.1
     # via
     #   coverage
     #   pytest
-typing-extensions==4.9.0
+typing-extensions==4.11.0
     # via asgiref
 urllib3==2.2.1
     # via requests
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-metadata

requirements/pip-tools.txt

@@ -4,15 +4,17 @@
 #
 #    make upgrade
 #
-build==1.0.3
+build==1.2.1
     # via pip-tools
 click==8.1.7
     # via pip-tools
-importlib-metadata==7.0.1
-    # via build
-packaging==23.2
+importlib-metadata==6.11.0
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   build
+packaging==24.0
     # via build
-pip-tools==7.4.0
+pip-tools==7.4.1
     # via -r requirements/pip-tools.in
 pyproject-hooks==1.0.0
     # via
@@ -23,9 +25,9 @@ tomli==2.0.1
     #   build
     #   pip-tools
     #   pyproject-hooks
-wheel==0.42.0
+wheel==0.43.0
     # via pip-tools
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/pip.txt

@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-wheel==0.42.0
+wheel==0.43.0
     # via -r requirements/pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.0
     # via -r requirements/pip.in
-setuptools==69.1.0
+setuptools==69.5.1
     # via -r requirements/pip.in

requirements/test.txt

@@ -6,23 +6,27 @@
 #
 alabaster==0.7.13
     # via sphinx
-asgiref==3.7.2
+asgiref==3.8.1
     # via django
 babel==2.14.0
     # via
     #   -r requirements/base.in
     #   enmerkar
     #   sphinx
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   django
 certifi==2024.2.2
     # via requests
 charset-normalizer==3.3.2
     # via requests
-coverage[toml]==7.4.2
+coverage[toml]==7.5.0
     # via
     #   -r requirements/test.in
     #   pytest-cov
     #   python-coveralls
-django==3.2.24
+django==4.2.11
     # via
     #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
     #   -r requirements/base.in
@@ -31,18 +35,20 @@ docutils==0.20.1
     # via sphinx
 enmerkar==0.7.1
     # via -r requirements/base.in
-exceptiongroup==1.2.0
+exceptiongroup==1.2.1
     # via pytest
-execnet==2.0.2
+execnet==2.1.1
     # via pytest-cache
 flake8==7.0.0
     # via -r requirements/test.in
-idna==3.6
+idna==3.7
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.1
-    # via sphinx
+importlib-metadata==6.11.0
+    # via
+    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+    #   sphinx
 iniconfig==2.0.0
     # via pytest
 jinja2==3.1.3
@@ -53,13 +59,13 @@ markupsafe==2.1.5
     # via jinja2
 mccabe==0.7.0
     # via flake8
-packaging==23.2
+packaging==24.0
     # via
     #   pytest
     #   sphinx
 pep8==1.7.1
     # via pytest-pep8
-pluggy==1.4.0
+pluggy==1.5.0
     # via pytest
 pycodestyle==2.11.1
     # via flake8
@@ -69,7 +75,7 @@ pyflakes==3.2.0
     #   pytest-flakes
 pygments==2.17.2
     # via sphinx
-pytest==8.0.1
+pytest==8.1.1
     # via
     #   -r requirements/test.in
     #   pytest-cache
@@ -78,7 +84,7 @@ pytest==8.0.1
     #   pytest-pep8
 pytest-cache==1.0
     # via pytest-pep8
-pytest-cov==4.1.0
+pytest-cov==5.0.0
     # via -r requirements/test.in
 pytest-flakes==4.0.5
     # via -r requirements/test.in
@@ -87,9 +93,7 @@ pytest-pep8==1.0.6
 python-coveralls==2.9.3
     # via -r requirements/test.in
 pytz==2024.1
-    # via
-    #   babel
-    #   django
+    # via babel
 pyyaml==6.0.1
     # via python-coveralls
 requests==2.31.0
@@ -114,15 +118,15 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-sqlparse==0.4.4
+sqlparse==0.5.0
     # via django
 tomli==2.0.1
     # via
     #   coverage
     #   pytest
-typing-extensions==4.9.0
+typing-extensions==4.11.0
     # via asgiref
 urllib3==2.2.1
     # via requests
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-metadata