From 4257f7f1cf037cdfd8f4ebcbdae15beb339386c9 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 10 Jun 2017 10:06:49 +0200 Subject: [PATCH] Require requests >= 2.14 2.14.0 had a this release feature: "When users provide invalid paths to certificate bundle files or directories Requests now raises IOError, rather than failing at the time of the HTTPS request with a fairly inscrutable certificate validation error." It turns out we're relying on this behavior in several places, like for example python-glanceclient: When users provide invalid paths to certificate bundle files or directories Requests now raises IOError, rather than failing at the time of the HTTPS request with a fairly inscrutable certificate validation error. FAIL: glanceclient.tests.unit.test_ssl.TestHTTPSVerifyCert.test_v2_requests_bad_ca tags: worker-3 ---------------------------------------------------------------------- Traceback (most recent call last): File ".tox/py27/lib/python2.7/site-packages/mock/mock.py", line 1305, in patched return func(*args, **keywargs) File "glanceclient/tests/unit/test_ssl.py", line 253, in test_v2_requests_bad_ca gc.images.get('image123') File "glanceclient/v2/images.py", line 197, in get return self._get(image_id) File "glanceclient/common/utils.py", line 545, in inner return RequestIdProxy(wrapped(*args, **kwargs)) File "glanceclient/v2/images.py", line 190, in _get resp, body = self.http_client.get(url, headers=header) File "glanceclient/common/http.py", line 289, in get return self._request('GET', url, **kwargs) File "glanceclient/common/http.py", line 260, in _request raise exc.CommunicationError(message=message) glanceclient.exc.CommunicationError: Error finding address for https://0.0.0.0:37335/v2/images/image123: [Errno 2] No such file or directory requests 2.14.0 bundles urllib3 1.21.1, so raise the lower version of that one as well to ensure minimum version consistency Change-Id: If3711576efbef54d0e917caffaf458eefca3a5b2 --- global-requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global-requirements.txt b/global-requirements.txt index e5f07f3e48..76e6fba9f1 100644 --- a/global-requirements.txt +++ b/global-requirements.txt @@ -273,7 +273,7 @@ pyudev # LGPLv2.1+ PyYAML>=3.10.0 # MIT qpid-python;python_version=='2.7' # Apache-2.0 reno>=1.8.0,!=2.3.1 # Apache-2.0 -requests>=2.10.0,!=2.12.2,!=2.13.0 # Apache-2.0 +requests>=2.14.2 # Apache-2.0 requests-aws>=0.1.4 # BSD License (3 clause) requests-kerberos>=0.6 # ISC requestsexceptions>=1.2.0 # Apache-2.0 @@ -307,7 +307,7 @@ tempest-lib>=0.14.0 # Apache-2.0 tooz>=1.47.0 # Apache-2.0 tosca-parser>=0.8.1 # Apache-2.0 tripleo-common>=7.1.0 # Apache-2.0 -urllib3>=1.15.1 # MIT +urllib3>=1.21.1 # MIT unicodecsv>=0.8.0;python_version<'3.0' # BSD warlock>=1.0.1,!=1.3.0,<2 # Apache-2.0 WebOb>=1.7.1 # MIT