chore: Upgrade Python requirements (#36079)

openedx · Jan 8, 2025 · 67c122b · 67c122b
1 parent 942d23a
commit 67c122b
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 3 deletions.
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -28,3 +28,7 @@ elasticsearch<7.14.0
 # Cause: https://github.com/openedx/edx-lint/issues/458
 # This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
 pip<24.3
+
+# Cause: https://github.com/openedx/edx-lint/issues/475
+# This can be unpinned once https://github.com/openedx/edx-lint/issues/476 has been resolved.
+urllib3<2.3.0
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -181,3 +181,10 @@ social-auth-app-django<=5.4.1
 # # Date: 2024-10-14
 # # The edx-enterprise is currently using edx-rest-api-client==5.7.1, which needs to be updated first.
 # edx-rest-api-client==5.7.1
+
+# Date 2025-01-08
+# elasticsearch==7.13.x is downgrading urllib3 from 2.2.3 to 1.26.20
+# https://github.com/elastic/elasticsearch-py/blob/v7.13.4/setup.py#L42
+# We are pinning this until we can upgrade to a version of elasticsearch that uses a more recent version of urllib3.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35126
+elasticsearch==7.9.1
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -1212,6 +1212,7 @@ uritemplate==4.1.1
     #   google-api-python-client
 urllib3==1.26.20
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   botocore
     #   elasticsearch
     #   py2neo

diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
@@ -2172,6 +2172,7 @@ uritemplate==4.1.1
     #   google-api-python-client
 urllib3==1.26.20
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   botocore

diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
@@ -1526,6 +1526,7 @@ uritemplate==4.1.1
     #   google-api-python-client
 urllib3==1.26.20
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   botocore
     #   elasticsearch

diff --git a/requirements/edx/semgrep.txt b/requirements/edx/semgrep.txt
@@ -124,8 +124,9 @@ typing-extensions==4.12.2
     # via
     #   opentelemetry-sdk
     #   semgrep
-urllib3==2.3.0
+urllib3==2.2.3
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   requests
     #   semgrep
 wcmatch==8.5.2

diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
@@ -1612,6 +1612,7 @@ uritemplate==4.1.1
     #   google-api-python-client
 urllib3==1.26.20
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   botocore
     #   elasticsearch

diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt
@@ -158,6 +158,7 @@ uritemplate==4.1.1
     # via google-api-python-client
 urllib3==1.26.20
     # via
+    #   -c scripts/user_retirement/requirements/../../../requirements/common_constraints.txt
     #   -r scripts/user_retirement/requirements/base.in
     #   botocore
     #   requests

diff --git a/scripts/xblock/requirements.txt b/scripts/xblock/requirements.txt
@@ -14,5 +14,7 @@ idna==3.10
     # via requests
 requests==2.32.3
     # via -r scripts/xblock/requirements.in
-urllib3==2.3.0
-    # via requests
+urllib3==2.2.3
+    # via
+    #   -c scripts/xblock/../../requirements/common_constraints.txt
+    #   requests