Merge pull request #237 from openedx/jenkins/upgrade-python-requireme…

…nts-c2cc22a

Python Requirements Update

requirements/base.txt

@@ -8,11 +8,14 @@ amqp==5.2.0
     # via kombu
 appdirs==1.4.4
     # via fs
-asgiref==3.7.2
+asgiref==3.8.1
     # via django
-backports-zoneinfo[tzdata]==0.2.1
+backports-zoneinfo[tzdata]==0.2.1 ; python_version < "3.9"
     # via
+    #   -c requirements/constraints.txt
     #   celery
+    #   django
+    #   djangorestframework
     #   kombu
 billiard==4.2.0
     # via celery
@@ -31,13 +34,13 @@ click==8.1.7
     #   click-plugins
     #   click-repl
     #   edx-django-utils
-click-didyoumean==0.3.0
+click-didyoumean==0.3.1
     # via celery
 click-plugins==1.1.1
     # via celery
 click-repl==0.3.0
     # via celery
-django==3.2.24
+django==4.2.11
     # via
     #   -c requirements/common_constraints.txt
     #   django-crum
@@ -60,37 +63,39 @@ django-model-utils==4.4.0
     #   super-csv
 django-waffle==4.1.0
     # via edx-django-utils
-djangorestframework==3.14.0
+djangorestframework==3.15.1
     # via super-csv
 edx-bulk-grades==1.0.2
     # via -r requirements/base.in
 edx-celeryutils==1.2.5
     # via super-csv
-edx-django-utils==5.10.1
+edx-django-utils==5.11.0
     # via super-csv
 edx-opaque-keys==2.5.1
     # via edx-bulk-grades
 fs==2.4.16
     # via xblock
 idna==3.6
     # via requests
-importlib-metadata==7.0.1
-    # via markdown
+importlib-metadata==6.11.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   markdown
 jsonfield==3.1.0
     # via edx-celeryutils
-kombu==5.3.5
+kombu==5.3.6
     # via celery
 lxml==5.1.0
     # via xblock
 mako==1.3.2
     # via xblock
-markdown==3.5.2
+markdown==3.6
     # via -r requirements/base.in
 markupsafe==2.1.5
     # via
     #   mako
     #   xblock
-newrelic==9.6.0
+newrelic==9.8.0
     # via edx-django-utils
 path==16.10.0
     # via path-py
@@ -108,15 +113,12 @@ pymongo==3.13.0
     # via edx-opaque-keys
 pynacl==1.5.0
     # via edx-django-utils
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via
     #   celery
     #   xblock
 pytz==2024.1
-    # via
-    #   django
-    #   djangorestframework
-    #   xblock
+    # via xblock
 pyyaml==6.0.1
     # via xblock
 requests==2.31.0
@@ -135,13 +137,13 @@ slumber==0.7.1
     # via edx-bulk-grades
 sqlparse==0.4.4
     # via django
-stevedore==5.1.0
+stevedore==5.2.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
 super-csv==3.1.0
     # via edx-bulk-grades
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via
     #   asgiref
     #   edx-opaque-keys
@@ -165,9 +167,9 @@ web-fragments==2.1.0
     #   xblock
 webob==1.8.7
     # via xblock
-xblock==1.10.0
+xblock==3.0.0
     # via -r requirements/base.in
-zipp==3.17.0
+zipp==3.18.1
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/ci.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cachetools==5.3.2
+cachetools==5.3.3
     # via
     #   -r requirements/tox.txt
     #   tox
@@ -20,12 +20,12 @@ distlib==0.3.8
     # via
     #   -r requirements/tox.txt
     #   virtualenv
-filelock==3.13.1
+filelock==3.13.3
     # via
     #   -r requirements/tox.txt
     #   tox
     #   virtualenv
-packaging==23.2
+packaging==24.0
     # via
     #   -r requirements/tox.txt
     #   pyproject-api
@@ -50,9 +50,9 @@ tomli==2.0.1
     #   -r requirements/tox.txt
     #   pyproject-api
     #   tox
-tox==4.13.0
+tox==4.14.2
     # via -r requirements/tox.txt
-virtualenv==20.25.0
+virtualenv==20.25.1
     # via
     #   -r requirements/tox.txt
     #   tox

requirements/common_constraints.txt

@@ -13,11 +13,20 @@
 
 
 # using LTS django version
-Django<4.0
+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
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
 django-simple-history==3.0.0
+
+# opentelemetry requires version 6.x at the moment:
+# https://github.com/open-telemetry/opentelemetry-python/issues/3570
+# Normally this could be added as a constraint in edx-django-utils, where we're
+# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
+# that uses version 7.x, and then there's no undoing that when compiling base.txt.
+# So we need to pin it globally, for now.
+# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
+importlib-metadata<7