Merge pull request #2198 from openedx/jenkins/upgrade-python-requirem…

…ents-f820b87

Python Requirements Update

requirements/base.txt

@@ -6,13 +6,13 @@
 #
 appdirs==1.4.4
     # via fs
-asgiref==3.7.2
+asgiref==3.8.1
     # via django
 bleach==6.1.0
     # via -r requirements/base.in
-boto3==1.34.44
+boto3==1.34.72
     # via -r requirements/base.in
-botocore==1.34.44
+botocore==1.34.72
     # via
     #   boto3
     #   s3transfer
@@ -26,11 +26,11 @@ click==8.1.7
     # via
     #   code-annotations
     #   edx-django-utils
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via edx-toggles
 defusedxml==0.7.1
     # via -r requirements/base.in
-django==3.2.24
+django==3.2.25
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
@@ -63,7 +63,7 @@ djangorestframework==3.14.0
     # via
     #   -r requirements/base.in
     #   edx-submissions
-edx-django-utils==5.10.1
+edx-django-utils==5.11.0
     # via
     #   -r requirements/base.in
     #   edx-toggles
@@ -113,7 +113,7 @@ markupsafe==2.1.5
     #   jinja2
     #   mako
     #   xblock
-newrelic==9.6.0
+newrelic==9.8.0
     # via edx-django-utils
 path==13.1.0
     # via
@@ -134,7 +134,7 @@ 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
     #   -r requirements/base.in
     #   botocore
@@ -160,7 +160,7 @@ pyyaml==6.0.1
     #   xblock
 requests==2.31.0
     # via python-swiftclient
-s3transfer==0.10.0
+s3transfer==0.10.1
     # via boto3
 simplejson==3.19.2
     # via xblock
@@ -173,14 +173,14 @@ six==1.16.0
     #   python-swiftclient
 sqlparse==0.4.4
     # via django
-stevedore==5.1.0
+stevedore==5.2.0
     # via
     #   code-annotations
     #   edx-django-utils
     #   edx-opaque-keys
 text-unidecode==1.3
     # via python-slugify
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via
     #   asgiref
     #   edx-opaque-keys

requirements/ci.txt

@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cachetools==5.3.2
+cachetools==5.3.3
     # via
     #   -r requirements/tox.txt
     #   tox
@@ -30,7 +30,7 @@ distlib==0.3.8
     #   virtualenv
 docopt==0.6.2
     # via coveralls
-filelock==3.13.1
+filelock==3.13.3
     # via
     #   -r requirements/tox.txt
     #   tox
@@ -39,7 +39,7 @@ idna==2.8
     # via
     #   -c requirements/constraints.txt
     #   requests
-packaging==23.2
+packaging==24.0
     # via
     #   -r requirements/tox.txt
     #   pyproject-api
@@ -64,11 +64,11 @@ tomli==2.0.1
     #   -r requirements/tox.txt
     #   pyproject-api
     #   tox
-tox==4.13.0
+tox==4.14.2
     # via -r requirements/tox.txt
 urllib3==2.2.1
     # via requests
-virtualenv==20.25.0
+virtualenv==20.25.1
     # via
     #   -r requirements/tox.txt
     #   tox

requirements/common_constraints.txt

@@ -14,11 +14,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
 
+
+# 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

requirements/constraints.txt

@@ -30,4 +30,7 @@ importlib-metadata<2
 setuptools<60.0
 
 # incremental upgrade plan.
-django-simple-history<=3.1.1
+django-simple-history<=3.1.1
+
+# xblock==1.10.0 upgrade causes test failures which need to be fixed separately
+xblock==1.10.0

requirements/docs.txt

@@ -36,7 +36,7 @@ livereload==2.6.3
     # via sphinx-autobuild
 markupsafe==2.1.5
     # via jinja2
-packaging==23.2
+packaging==24.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
@@ -89,7 +89,7 @@ sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
 tornado==6.4
     # via livereload
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via pydata-sphinx-theme
 urllib3==2.2.1
     # via requests

requirements/pip-tools.txt

@@ -4,15 +4,15 @@
 #
 #    make upgrade
 #
-build==1.0.3
+build==1.1.1
     # via pip-tools
 click==8.1.7
     # via pip-tools
-importlib-metadata==7.0.1
+importlib-metadata==7.1.0
     # via build
-packaging==23.2
+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 +23,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,7 +4,7 @@
 #
 #    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: