fix: install backports-zoneinfo only for python<3.9

requirements/base.txt

@@ -6,17 +6,19 @@
 #
 appdirs==1.4.4
     # via fs
-asgiref==3.7.2
+asgiref==3.8.1
     # via
     #   django
     #   django-simple-history
-backports-zoneinfo==0.2.1
-    # via django
+backports-zoneinfo==0.2.1 ; python_version < "3.9"
+    # via
+    #   -c requirements/constraints.txt
+    #   django
 bleach==6.1.0
     # via -r requirements/base.in
-boto3==1.34.49
+boto3==1.34.72
     # via -r requirements/base.in
-botocore==1.34.49
+botocore==1.34.72
     # via
     #   boto3
     #   s3transfer
@@ -34,12 +36,7 @@ code-annotations==1.7.0
     # via edx-toggles
 defusedxml==0.7.1
     # via -r requirements/base.in
-<<<<<<< HEAD
-django==3.2.24
-django==3.2.24
-=======
-django==4.2.10
->>>>>>> 79d8e6366 (feat: python 3.12 support.)
+django==4.2.11
     # via
     #   -r requirements/base.in
     #   django-crum
@@ -55,7 +52,6 @@ django-crum==0.7.9
     # via
     #   edx-django-utils
     #   edx-toggles
-django-model-utils==4.4.0
 django-model-utils==4.4.0
     # via
     #   -r requirements/base.in
@@ -114,7 +110,7 @@ markupsafe==2.1.5
     #   jinja2
     #   mako
     #   xblock
-newrelic==9.7.0
+newrelic==9.8.0
     # via edx-django-utils
 path==16.10.0
     # via
@@ -139,10 +135,9 @@ python-dateutil==2.9.0.post0
     #   -r requirements/base.in
     #   botocore
     #   xblock
-python-slugify==8.0.4
 python-slugify==8.0.4
     # via code-annotations
-python-swiftclient==4.4.0
+python-swiftclient==4.5.0
     # via -r requirements/base.in
 pytz==2024.1
     # via
@@ -169,15 +164,13 @@ six==1.16.0
     #   python-dateutil
 sqlparse==0.4.4
     # via django
-stevedore==5.2.0
 stevedore==5.2.0
     # via
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
 text-unidecode==1.3
     # via python-slugify
-typing-extensions==4.10.0
 typing-extensions==4.10.0
     # via
     #   asgiref
@@ -196,7 +189,7 @@ webencodings==0.5.1
     #   html5lib
 webob==1.8.7
     # via xblock
-xblock==1.10.0
+xblock==3.0.0
     # via -r requirements/base.in
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/ci.txt

@@ -37,7 +37,7 @@ filelock==3.13.3
     #   virtualenv
 idna==3.6
     # via requests
-packaging==23.2
+packaging==24.0
     # via
     #   -r requirements/tox.txt
     #   pyproject-api
@@ -66,7 +66,6 @@ tox==4.14.2
     # via -r requirements/tox.txt
 urllib3==2.2.1
     # via requests
-virtualenv==20.25.1
 virtualenv==20.25.1
     # via
     #   -r requirements/tox.txt

requirements/common_constraints.txt

@@ -1,9 +1,4 @@
 
-
-
-
-
-
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #
@@ -18,6 +13,9 @@
 #  this file from Github directly. It does not require packaging in edx-lint.
 
 
+# using LTS django version
+Django<5.0
+
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 elasticsearch<7.14.0

requirements/constraints.txt

@@ -1,3 +1,6 @@
 # Version constraints for pip-installation.
 # greater version breaking few tests.
-moto<5.0
+moto<5.0
+
+# backports.zoneinfo is needed for Django 4.0+ and Python<3.9 only
+backports.zoneinfo; python_version<'3.9'

requirements/docs.txt

@@ -28,7 +28,7 @@ idna==3.6
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.1
+importlib-metadata==7.1.0
     # via sphinx
 jinja2==3.1.3
     # via sphinx
@@ -93,5 +93,5 @@ typing-extensions==4.10.0
     # via pydata-sphinx-theme
 urllib3==2.2.1
     # via requests
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-metadata

requirements/pip.txt

@@ -10,5 +10,5 @@ wheel==0.43.0
 # The following packages are considered to be unsafe in a requirements file:
 pip==24.0
     # via -r requirements/pip.in
-setuptools==69.1.1
+setuptools==69.2.0
     # via -r requirements/pip.in