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

…nts-6751924

Python Requirements Update

requirements/base.txt

@@ -31,7 +31,7 @@ idna==3.6
     # via requests
 importlib-metadata==7.0.2
     # via tutor
-importlib-resources==6.1.3
+importlib-resources==6.3.1
     # via
     #   -r requirements/base.in
     #   tutor
@@ -103,7 +103,7 @@ urllib3==2.2.1
     #   requests
 websocket-client==1.7.0
     # via kubernetes
-zipp==3.17.0
+zipp==3.18.1
     # via
     #   importlib-metadata
     #   importlib-resources

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

@@ -18,7 +18,7 @@ asttokens==2.4.1
     #   transifex-python
 bcrypt==4.1.2
     # via -r requirements/base.txt
-black==24.2.0
+black==24.3.0
     # via -r requirements/dev.in
 cachetools==5.3.3
     # via
@@ -67,7 +67,7 @@ importlib-metadata==7.0.2
     #   pyinstaller-hooks-contrib
     #   tutor
     #   twine
-importlib-resources==6.1.3
+importlib-resources==6.3.1
     # via
     #   -r requirements/base.txt
     #   keyring
@@ -248,7 +248,7 @@ websocket-client==1.7.0
     # via
     #   -r requirements/base.txt
     #   kubernetes
-zipp==3.17.0
+zipp==3.18.1
     # via
     #   -r requirements/base.txt
     #   importlib-metadata

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
@@ -23,9 +25,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,11 +4,11 @@
 #
 #    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:
 pip==24.0
     # via -r requirements/pip.in
-setuptools==69.1.1
+setuptools==69.2.0
     # via -r requirements/pip.in