From 17d48efc50e0f3ed1e36b829a3665f73a7dc85ed Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 13 Nov 2020 11:36:32 +1100 Subject: [PATCH] Revert "requirements: temporarily pin urblib3 for zuul-client" This reverts commit a58b29c6bf38ff47b12b5583dfc61c50ce083f2a. The dependency is uncapped in zuul-client now. Change-Id: I9d31326c444cf225442c0b46e040312be9a2ff73 --- requirements.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 268c77b194..313790c181 100644 --- a/requirements.txt +++ b/requirements.txt @@ -33,14 +33,5 @@ cherrypy ws4py routes jsonpath-rw -# zuul-client pins to requests==1.24.0 which is incompatible -# with urllib >= 1.26.0. We can not simply remove that pin -# in zuul-client because it runs the zuul-client-zuul-functional -# job, which runs a tox environment. Our tox role first installs -# everything without tests, before installing siblings. This means -# it tries to install the released zuul-client first; ignoring any -# changes to the requirements that might be in the change. -# By pinning urllib3 here we can get that test working, which -# allows us to merge the removal to zuul-client. -urllib3!=1.25.4,!=1.25.5,<1.26.0 # https://github.com/urllib3/urllib3/pull/1684 +urllib3!=1.25.4,!=1.25.5 # https://github.com/urllib3/urllib3/pull/1684 cheroot!=8.1.*,!=8.2.*,!=8.3.0 # https://github.com/cherrypy/cheroot/issues/263