fix: install backports-zoneinfo only for python<3.9

openedx · Mar 21, 2024 · 67148bc · 67148bc
1 parent 07582e1
commit 67148bc
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -8,8 +8,10 @@ asgiref==3.8.0
     # via django
 attrs==23.2.0
     # via openedx-events
-backports-zoneinfo==0.2.1
-    # via django
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   django
 cffi==1.16.0
     # via pynacl
 click==8.1.7

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -10,3 +10,6 @@
 
 # Common constraints for edx repos
 -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
+
+# backports.zoneinfo is needed for Python 3.8 + Django 4.2 compatibility
+backports.zoneinfo; python_version<'3.9'
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -21,8 +21,9 @@ avro==1.11.3
     # via
     #   -r requirements/quality.txt
     #   confluent-kafka
-backports-zoneinfo==0.2.1
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/quality.txt
     #   django
 build==1.1.1

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -24,8 +24,9 @@ babel==2.14.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
-backports-zoneinfo==0.2.1
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   django
 beautifulsoup4==4.12.3

diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -20,8 +20,9 @@ avro==1.11.3
     # via
     #   -r requirements/test.txt
     #   confluent-kafka
-backports-zoneinfo==0.2.1
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   django
 certifi==2024.2.2

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -14,8 +14,9 @@ attrs==23.2.0
     #   openedx-events
 avro==1.11.3
     # via confluent-kafka
-backports-zoneinfo==0.2.1
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   django
 certifi==2024.2.2

diff --git a/tox.ini b/tox.ini
@@ -36,8 +36,8 @@ norecursedirs = .* docs requirements site-packages
 
 [testenv]
 deps = 
-    django32: Django>=3.2,<4.0
-    django40: Django>=4.0,<4.1
+    setuptools
+    django42: Django>=4.2,<4.3
     -r{toxinidir}/requirements/test.txt
 commands = 
     python manage.py check
@@ -53,6 +53,7 @@ allowlist_externals =
     make
     rm
 deps = 
+    setuptools
     -r{toxinidir}/requirements/doc.txt
 commands = 
     doc8 --ignore-path docs/_build README.rst docs
@@ -86,6 +87,7 @@ commands =
 setenv = 
     DJANGO_SETTINGS_MODULE = test_settings
 deps = 
+    setuptools
     -r{toxinidir}/requirements/test.txt
 commands = 
     code_annotations django_find_annotations --config_file .pii_annotations.yml --lint --report --coverage