chore: Updating Python Requirements (#1568)

openedx-unsupported · Mar 22, 2024 · 3d0c723 · 3d0c723
1 parent 123ee05
commit 3d0c723
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 41 deletions.
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -11,7 +11,9 @@ asgiref==3.7.2
     #   django
     #   django-countries
 backports-zoneinfo==0.2.1
-    # via django
+    # via
+    #   django
+    #   djangorestframework
 certifi==2024.2.2
     # via requests
 cffi==1.16.0
@@ -24,7 +26,7 @@ click==8.1.7
     # via
     #   code-annotations
     #   edx-django-utils
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via edx-toggles
 cryptography==42.0.5
     # via
@@ -85,7 +87,7 @@ django-webpack-loader==0.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.in
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/base.in
     #   djangorestframework-csv
@@ -171,8 +173,6 @@ python-slugify==8.0.4
     #   code-annotations
 python3-openid==3.2.0
     # via social-auth-core
-pytz==2024.1
-    # via djangorestframework
 pyyaml==6.0.1
     # via
     #   code-annotations

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/doc.txt b/requirements/doc.txt
@@ -23,6 +23,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/base.txt
     #   django
+    #   djangorestframework
 beautifulsoup4==4.12.3
     # via pydata-sphinx-theme
 certifi==2024.2.2
@@ -43,7 +44,7 @@ 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/base.txt
     #   edx-toggles
@@ -109,7 +110,7 @@ django-webpack-loader==0.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/base.txt
     #   djangorestframework-csv
@@ -158,8 +159,10 @@ idna==3.6
     #   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
     #   -r requirements/base.txt
@@ -245,10 +248,7 @@ python3-openid==3.2.0
     #   -r requirements/base.txt
     #   social-auth-core
 pytz==2024.1
-    # via
-    #   -r requirements/base.txt
-    #   babel
-    #   djangorestframework
+    # via babel
 pyyaml==6.0.1
     # via
     #   -r requirements/base.txt
@@ -341,7 +341,7 @@ urllib3==1.26.18
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
     #   requests
-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/github.txt b/requirements/github.txt
@@ -16,7 +16,7 @@ colorama==0.4.6
     # via
     #   -r requirements/tox.txt
     #   tox
-coverage==7.4.3
+coverage==7.4.4
     # via -r requirements/github.in
 distlib==0.3.8
     # via

diff --git a/requirements/local.txt b/requirements/local.txt
@@ -20,6 +20,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/test.txt
     #   django
+    #   djangorestframework
 build==1.1.1
     # via
     #   -r requirements/pip_tools.txt
@@ -58,7 +59,7 @@ click-log==0.4.0
     # via
     #   -r requirements/test.txt
     #   edx-lint
-code-annotations==1.6.0
+code-annotations==1.7.0
     # via
     #   -r requirements/test.txt
     #   edx-lint
@@ -67,7 +68,7 @@ colorama==0.4.6
     # via
     #   -r requirements/tox.txt
     #   tox
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
     # via
     #   -r requirements/test.txt
     #   pytest-cov
@@ -148,7 +149,7 @@ django-webpack-loader==0.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.txt
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/test.txt
     #   djangorestframework-csv
@@ -204,8 +205,9 @@ idna==3.6
     # via
     #   -r requirements/test.txt
     #   requests
-importlib-metadata==7.0.2
+importlib-metadata==6.11.0
     # via
+    #   -c requirements/common_constraints.txt
     #   -r requirements/pip_tools.txt
     #   build
 iniconfig==2.0.0
@@ -360,10 +362,6 @@ python3-openid==3.2.0
     # via
     #   -r requirements/test.txt
     #   social-auth-core
-pytz==2024.1
-    # via
-    #   -r requirements/test.txt
-    #   djangorestframework
 pyyaml==6.0.1
     # via
     #   -r requirements/test.txt
@@ -468,7 +466,7 @@ wheel==0.43.0
     # via
     #   -r requirements/pip_tools.txt
     #   pip-tools
-zipp==3.17.0
+zipp==3.18.1
     # via
     #   -r requirements/pip_tools.txt
     #   importlib-metadata

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/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/production.txt b/requirements/production.txt
@@ -15,6 +15,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/base.txt
     #   django
+    #   djangorestframework
 certifi==2024.2.2
     # via
     #   -r requirements/base.txt
@@ -33,7 +34,7 @@ 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/base.txt
     #   edx-toggles
@@ -99,7 +100,7 @@ django-webpack-loader==0.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/base.txt
     #   djangorestframework-csv
@@ -226,10 +227,6 @@ python3-openid==3.2.0
     # via
     #   -r requirements/base.txt
     #   social-auth-core
-pytz==2024.1
-    # via
-    #   -r requirements/base.txt
-    #   djangorestframework
 pyyaml==6.0.1
     # via
     #   -r requirements/base.txt

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -20,6 +20,7 @@ backports-zoneinfo==0.2.1
     # via
     #   -r requirements/base.txt
     #   django
+    #   djangorestframework
 certifi==2024.2.2
     # via
     #   -r requirements/base.txt
@@ -42,12 +43,12 @@ 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/base.txt
     #   edx-lint
     #   edx-toggles
-coverage[toml]==7.4.3
+coverage[toml]==7.4.4
     # via
     #   -r requirements/test.in
     #   pytest-cov
@@ -118,7 +119,7 @@ django-webpack-loader==0.7.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/base.txt
-djangorestframework==3.14.0
+djangorestframework==3.15.0
     # via
     #   -r requirements/base.txt
     #   djangorestframework-csv
@@ -279,10 +280,6 @@ python3-openid==3.2.0
     # via
     #   -r requirements/base.txt
     #   social-auth-core
-pytz==2024.1
-    # via
-    #   -r requirements/base.txt
-    #   djangorestframework
 pyyaml==6.0.1
     # via
     #   -r requirements/base.txt