chore: Updating Python Requirements (#239)

openedx · Mar 22, 2024 · 2e06ee1 · 2e06ee1
1 parent 511f245
commit 2e06ee1
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 31 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -9,7 +9,9 @@ appdirs==1.4.4
 asgiref==3.7.2
     # via django
 backports-zoneinfo==0.2.1
-    # via django
+    # via
+    #   django
+    #   djangorestframework
 certifi==2024.2.2
     # via requests
 cffi==1.16.0
@@ -41,7 +43,7 @@ django-waffle==4.1.0
     # via
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   drf-jwt
     #   edx-drf-extensions
@@ -88,9 +90,7 @@ pynacl==1.5.0
 python-dateutil==2.9.0.post0
     # via xblock
 pytz==2024.1
-    # via
-    #   djangorestframework
-    #   xblock
+    # via xblock
 pyyaml==6.0.1
     # via xblock
 requests==2.31.0

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -16,7 +16,7 @@ codecov==2.1.13
     # via -r requirements/ci.in
 colorama==0.4.6
     # via tox
-coverage==7.4.3
+coverage==7.4.4
     # via codecov
 distlib==0.3.8
     # via virtualenv

diff --git a/requirements/common_constraints.txt b/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
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -23,6 +23,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/quality.txt
     #   django
+    #   djangorestframework
 build==1.1.1
     # via
     #   -r requirements/pip-tools.txt
@@ -53,11 +54,11 @@ click-log==0.4.0
     # via
     #   -r requirements/quality.txt
     #   edx-lint
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via
     #   -r requirements/quality.txt
     #   edx-lint
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
     # via
     #   -r requirements/quality.txt
     #   pytest-cov
@@ -98,7 +99,7 @@ django-waffle==4.1.0
     #   -r requirements/quality.txt
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/quality.txt
     #   drf-jwt
@@ -133,8 +134,9 @@ idna==3.6
     # via
     #   -r requirements/quality.txt
     #   requests
-importlib-metadata==7.0.2
+importlib-metadata==6.11.0
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/pip-tools.txt
     #   build
     #   path-py
@@ -284,7 +286,6 @@ python-slugify==8.0.4
 pytz==2024.1
     # via
     #   -r requirements/quality.txt
-    #   djangorestframework
     #   xblock
 pyyaml==6.0.1
     # via
@@ -371,7 +372,7 @@ wheel==0.43.0
     #   pip-tools
 xblock==2.0.0
     # via -r requirements/quality.txt
-zipp==3.17.0
+zipp==3.18.1
     # via
     #   -r requirements/pip-tools.txt
     #   importlib-metadata

diff --git a/requirements/doc.txt b/requirements/doc.txt
@@ -24,6 +24,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/test.txt
     #   django
+    #   djangorestframework
 beautifulsoup4==4.12.3
     # via pydata-sphinx-theme
 certifi==2024.2.2
@@ -44,9 +45,9 @@ click==8.1.7
     #   -r requirements/test.txt
     #   code-annotations
     #   edx-django-utils
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via -r requirements/test.txt
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
     # via
     #   -r requirements/test.txt
     #   pytest-cov
@@ -79,7 +80,7 @@ django-waffle==4.1.0
     #   -r requirements/test.txt
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/test.txt
     #   drf-jwt
@@ -121,12 +122,13 @@ idna==3.6
     #   requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.2
+importlib-metadata==6.11.0
     # via
+    #   -c requirements/common_constraints.txt
     #   keyring
     #   sphinx
     #   twine
-importlib-resources==6.1.3
+importlib-resources==6.3.1
     # via keyring
 iniconfig==2.0.0
     # via
@@ -241,7 +243,6 @@ pytz==2024.1
     # via
     #   -r requirements/test.txt
     #   babel
-    #   djangorestframework
     #   xblock
 pyyaml==6.0.1
     # via
@@ -348,7 +349,7 @@ webob==1.8.7
     #   xblock
 xblock==2.0.0
     # via -r requirements/test.txt
-zipp==3.17.0
+zipp==3.18.1
     # via
     #   importlib-metadata
     #   importlib-resources

diff --git a/requirements/pip-tools.txt b/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:

diff --git a/requirements/pip.txt b/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
diff --git a/requirements/quality.txt b/requirements/quality.txt
@@ -20,6 +20,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/test.txt
     #   django
+    #   djangorestframework
 certifi==2024.2.2
     # via
     #   -r requirements/test.txt
@@ -42,11 +43,11 @@ click==8.1.7
     #   edx-lint
 click-log==0.4.0
     # via edx-lint
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via
     #   -r requirements/test.txt
     #   edx-lint
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
     # via
     #   -r requirements/test.txt
     #   pytest-cov
@@ -80,7 +81,7 @@ django-waffle==4.1.0
     #   -r requirements/test.txt
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/test.txt
     #   drf-jwt
@@ -220,7 +221,6 @@ python-slugify==8.0.4
 pytz==2024.1
     # via
     #   -r requirements/test.txt
-    #   djangorestframework
     #   xblock
 pyyaml==6.0.1
     # via

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -16,6 +16,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/base.txt
     #   django
+    #   djangorestframework
 certifi==2024.2.2
     # via
     #   -r requirements/base.txt
@@ -34,9 +35,9 @@ click==8.1.7
     #   -r requirements/base.txt
     #   code-annotations
     #   edx-django-utils
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via -r requirements/test.in
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
     # via pytest-cov
 cryptography==42.0.5
     # via
@@ -65,7 +66,7 @@ django-waffle==4.1.0
     #   -r requirements/base.txt
     #   edx-django-utils
     #   edx-drf-extensions
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/base.txt
     #   drf-jwt
@@ -164,7 +165,6 @@ python-slugify==8.0.4
 pytz==2024.1
     # via
     #   -r requirements/base.txt
-    #   djangorestframework
     #   xblock
 pyyaml==6.0.1
     # via