parent e8883bd

author awais qureshi <[email protected]> 1711529508 +0500 committer awais qureshi <[email protected]> 1712570123 +0500 parent e8883bd author awais qureshi <[email protected]> 1711529508 +0500 committer awais qureshi <[email protected]> 1712570114 +0500 parent e8883bd author awais qureshi <[email protected]> 1711529508 +0500 committer awais qureshi <[email protected]> 1712570094 +0500 feat: Adding python3.12 support.
edx · Apr 8, 2024 · 22493ec · 22493ec
1 parent e8883bd
commit 22493ec
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8"]
+        python-version: ["3.8", "3.12"]
         toxenv: [django42, quality, pii_check, check_keywords]
     steps:
     - uses: actions/checkout@v2

diff --git a/Makefile b/Makefile
@@ -99,8 +99,8 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)	## update the requirements/*.txt files with t
 	pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
 	pip install -qr requirements/pip.txt
 	pip install -qr requirements/pip-tools.txt
-	pip-compile --upgrade -o requirements/base.txt requirements/base.in
-	pip-compile --upgrade -o requirements/test.txt requirements/test.in
+	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/base.txt requirements/base.in
+	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/test.txt requirements/test.in
 	pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
 	pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
 	pip-compile --upgrade -o requirements/dev.txt requirements/dev.in

diff --git a/requirements/base.in b/requirements/base.in
@@ -26,3 +26,4 @@ mock
 inflect
 social-auth-core
 boto3
+setuptools
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -17,3 +17,7 @@ edx_rest_api_client==4.0.1      # versions>4.0.1 have backward incompatible chan
 
 # Django5 release is inline. So better to add constraint.
 Django<4.3
+
+
+# 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/doc.txt b/requirements/doc.txt
@@ -580,3 +580,6 @@ zipp==3.18.1
     # via
     #   -r requirements/test.txt
     #   importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -536,3 +536,6 @@ zipp==3.18.1
     # via
     #   -r requirements/test.txt
     #   importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools
diff --git a/requirements/test.in b/requirements/test.in
@@ -13,4 +13,5 @@ mock
 pytest
 pytest-cov
 pytest-django
+setuptools
 tox
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -488,3 +488,9 @@ zipp==3.18.1
     # via
     #   -r requirements/base.txt
     #   importlib-metadata
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==69.2.0
+    # via
+    #   -r requirements/base.txt
+    #   -r requirements/test.in
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py38-django{42}
+envlist = py{38,312}-django{42}
 skipsdist = true
 
 [pytest]
@@ -25,6 +25,7 @@ commands =
 allowlist_externals =
     make
 deps =
+    setuptools
     -r{toxinidir}/requirements/dev.txt
 commands =
     make pii_check
@@ -33,6 +34,7 @@ commands =
 allowlist_externals =
     make
 deps =
+    setuptools
     -r{toxinidir}/requirements/dev.txt
 commands =
     make check_keywords
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,4 @@ mock @@
     inflect
     social-auth-core
     boto3
+    setuptools