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

…nts-dd8592f

Python Requirements Update

requirements/base.txt

@@ -26,8 +26,10 @@ idna==3.6
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.2
-    # via sphinx
+importlib-metadata==6.11.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   sphinx
 jinja2==3.1.3
     # via sphinx
 markupsafe==2.1.5
@@ -80,5 +82,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/common_constraints.txt

@@ -21,3 +21,12 @@ 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

requirements/dev.txt

@@ -44,8 +44,9 @@ imagesize==1.4.1
     # via
     #   -r requirements/base.txt
     #   sphinx
-importlib-metadata==7.0.2
+importlib-metadata==6.11.0
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/base.txt
     #   sphinx
 jinja2==3.1.3
@@ -141,7 +142,7 @@ urllib3==2.2.1
     # via
     #   -r requirements/base.txt
     #   requests
-zipp==3.17.0
+zipp==3.18.1
     # via
     #   -r requirements/base.txt
     #   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

requirements/pip_tools.txt

@@ -8,8 +8,10 @@ build==1.1.1
     # via pip-tools
 click==8.1.7
     # via pip-tools
-importlib-metadata==7.0.2
-    # via build
+importlib-metadata==6.11.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   build
 packaging==24.0
     # via build
 pip-tools==7.4.1
@@ -25,7 +27,7 @@ tomli==2.0.1
     #   pyproject-hooks
 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: