From fcf78db09e6abc101ab3703078d06d13ef2d7f6b Mon Sep 17 00:00:00 2001 From: Usama Sadiq Date: Tue, 22 Oct 2024 19:16:40 +0500 Subject: [PATCH] fix: pin urllib3 in user retirement scripts (#35699) * fix: pin urllib3 in user_retirement scripts --- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- scripts/user_retirement/requirements/base.in | 4 ++++ scripts/user_retirement/requirements/base.txt | 3 ++- scripts/user_retirement/requirements/testing.txt | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index f3f544cbe2b0..81b6d3b8a38a 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -2099,7 +2099,7 @@ tomlkit==0.13.2 # -r requirements/edx/testing.txt # pylint # snowflake-connector-python -tox==4.23.0 +tox==4.23.1 # via -r requirements/edx/testing.txt tqdm==4.66.5 # via diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 73630c0b97da..aac81743e149 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1556,7 +1556,7 @@ tomlkit==0.13.2 # -r requirements/edx/base.txt # pylint # snowflake-connector-python -tox==4.23.0 +tox==4.23.1 # via -r requirements/edx/testing.in tqdm==4.66.5 # via diff --git a/scripts/user_retirement/requirements/base.in b/scripts/user_retirement/requirements/base.in index d0bdab9082a5..eabc9393ea15 100644 --- a/scripts/user_retirement/requirements/base.in +++ b/scripts/user_retirement/requirements/base.in @@ -11,3 +11,7 @@ unicodecsv simplejson simple-salesforce google-api-python-client + +# urllib3 is needed for the user_retirement scripts +# constraint will be investigated and removed in a separate issue +urllib3<2.0.0 diff --git a/scripts/user_retirement/requirements/base.txt b/scripts/user_retirement/requirements/base.txt index 2749267db3eb..770b80c247f5 100644 --- a/scripts/user_retirement/requirements/base.txt +++ b/scripts/user_retirement/requirements/base.txt @@ -158,8 +158,9 @@ unicodecsv==0.14.1 # via -r scripts/user_retirement/requirements/base.in uritemplate==4.1.1 # via google-api-python-client -urllib3==2.2.3 +urllib3==1.26.20 # via + # -r scripts/user_retirement/requirements/base.in # botocore # requests zeep==4.3.1 diff --git a/scripts/user_retirement/requirements/testing.txt b/scripts/user_retirement/requirements/testing.txt index 8d143b1fa744..cfac5b0e62df 100644 --- a/scripts/user_retirement/requirements/testing.txt +++ b/scripts/user_retirement/requirements/testing.txt @@ -266,7 +266,7 @@ uritemplate==4.1.1 # via # -r scripts/user_retirement/requirements/base.txt # google-api-python-client -urllib3==2.2.3 +urllib3==1.26.20 # via # -r scripts/user_retirement/requirements/base.txt # botocore