From dc7919534151db5fa90e125697f1ccf188015935 Mon Sep 17 00:00:00 2001 From: Robert Knight Date: Tue, 17 Sep 2024 17:54:26 +0100 Subject: [PATCH] Pin urllib3 to v1.26.15 urllib3 v1.26.16 was reported by some GitHub users as encountering deadlocks in gevent. Pin to an earlier version to test whether this makes a difference in our case. --- requirements/dev.txt | 2 +- requirements/functests.txt | 2 +- requirements/lint.txt | 2 +- requirements/requirements.in | 7 +++++++ requirements/requirements.txt | 3 ++- requirements/tests.txt | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index 661cdab6..62f77310 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -234,7 +234,7 @@ ua-parser==0.18.0 # via # -r requirements/requirements.txt # pywb -urllib3==1.26.19 +urllib3==1.26.15 # via # -r requirements/requirements.txt # requests diff --git a/requirements/functests.txt b/requirements/functests.txt index f2531fd9..6446d0a2 100644 --- a/requirements/functests.txt +++ b/requirements/functests.txt @@ -207,7 +207,7 @@ ua-parser==0.18.0 # via # -r requirements/requirements.txt # pywb -urllib3==1.26.19 +urllib3==1.26.15 # via # -r requirements/requirements.txt # requests diff --git a/requirements/lint.txt b/requirements/lint.txt index e9478d3c..93a2d813 100644 --- a/requirements/lint.txt +++ b/requirements/lint.txt @@ -293,7 +293,7 @@ ua-parser==0.18.0 # -r requirements/requirements.txt # -r requirements/tests.txt # pywb -urllib3==1.26.19 +urllib3==1.26.15 # via # -r requirements/requirements.txt # -r requirements/tests.txt diff --git a/requirements/requirements.in b/requirements/requirements.in index 47c2067c..89d1e1e5 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -6,3 +6,10 @@ pywb sentry-sdk uwsgi whitenoise + +# Pin urllib3 to a version <1.26.16 to investigate if it resolves issues with +# gevent. +# +# See https://github.com/gevent/gevent/issues/1957 and +# https://github.com/urllib3/urllib3/issues/3289. +urllib3==1.26.15 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 0a5ac720..cb6b992f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -120,8 +120,9 @@ tldextract==5.1.1 # surt ua-parser==0.18.0 # via pywb -urllib3==1.26.19 +urllib3==1.26.15 # via + # -r requirements/requirements.in # requests # sentry-sdk uwsgi==2.0.26 diff --git a/requirements/tests.txt b/requirements/tests.txt index d0489bc8..d4d10927 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -211,7 +211,7 @@ ua-parser==0.18.0 # via # -r requirements/requirements.txt # pywb -urllib3==1.26.19 +urllib3==1.26.15 # via # -r requirements/requirements.txt # requests