fix: remove urllib3<2.0.0 constraint and update dependencies

mfarhan943 · Sep 25, 2024 · 47efd57 · 47efd57
1 parent f654039
commit 47efd57
Show file tree

Hide file tree

Showing 17 changed files with 453 additions and 403 deletions.
diff --git a/openedx/core/djangoapps/user_api/tests/test_views.py b/openedx/core/djangoapps/user_api/tests/test_views.py
@@ -635,7 +635,7 @@ def _assert_time_zone_is_valid(self, time_zone_info):
         assert time_zone_info['description'] == get_display_time_zone(time_zone_name)
 
     # The time zones count may need to change each time we upgrade pytz
-    @ddt.data((ALL_TIME_ZONES_URI, 433),
+    @ddt.data((ALL_TIME_ZONES_URI, 432),
               (COUNTRY_TIME_ZONES_URI, 23))
     @ddt.unpack
     def test_get_basic(self, country_uri, expected_count):

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -28,6 +28,9 @@ celery>=5.2.2,<6.0.0
 # for them.
 edx-enterprise==4.25.13
 
+# 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
+
 # Stay on LTS version, remove once this is added to common constraint
 Django<5.0
 
@@ -69,12 +72,6 @@ pycodestyle<2.9.0
 
 pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket.
 
-# urllib3>=2.0.0 conflicts with elastic search && snowflake-connector-python packages
-# which require urllib3<2 for now.
-# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222
-urllib3<2.0.0
-
-
 # Adding pin to avoid any major upgrade
 djangorestframework<3.15.0
 

diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
@@ -4,7 +4,7 @@
 #
 #    make upgrade
 #
-cffi==1.17.0
+cffi==1.17.1
     # via cryptography
 chem==1.3.0
     # via -r requirements/edx-sandbox/base.in
@@ -14,17 +14,17 @@ click==8.1.6
     #   nltk
 codejail-includes==1.0.0
     # via -r requirements/edx-sandbox/base.in
-contourpy==1.2.1
+contourpy==1.3.0
     # via matplotlib
-cryptography==43.0.0
+cryptography==43.0.1
     # via -r requirements/edx-sandbox/base.in
 cycler==0.12.1
     # via matplotlib
-fonttools==4.53.1
+fonttools==4.54.1
     # via matplotlib
 joblib==1.4.2
     # via nltk
-kiwisolver==1.4.5
+kiwisolver==1.4.7
     # via matplotlib
 lxml==4.9.4
     # via
@@ -61,7 +61,7 @@ pillow==10.4.0
     # via matplotlib
 pycparser==2.22
     # via cffi
-pyparsing==3.1.2
+pyparsing==3.1.4
     # via
     #   -r requirements/edx-sandbox/base.in
     #   chem
@@ -71,9 +71,9 @@ python-dateutil==2.9.0.post0
     # via matplotlib
 random2==1.0.2
     # via -r requirements/edx-sandbox/base.in
-regex==2024.7.24
+regex==2024.9.11
     # via nltk
-scipy==1.14.0
+scipy==1.14.1
     # via
     #   -r requirements/edx-sandbox/base.in
     #   chem
@@ -82,7 +82,7 @@ six==1.16.0
     # via
     #   codejail-includes
     #   python-dateutil
-sympy==1.13.2
+sympy==1.13.3
     # via
     #   -r requirements/edx-sandbox/base.in
     #   openedx-calc