aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-23 16:03:52 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-23 16:03:52 +0200
commit6c882aca203bd33c129e2b4e1e4f82886e4b1fe0 (patch)
tree7d3f03d9856f493f1c0a7da2e0763910579ff9c3
parent3d3afa49b9ca0e898ecb09c7271d28e0c737016b (diff)
downloadpython-requests-6c882aca203bd33c129e2b4e1e4f82886e4b1fe0.tar
python-requests-6c882aca203bd33c129e2b4e1e4f82886e4b1fe0.tar.gz
Populate install_requires for unbundled packages
This will avoid breakage updating urllib3 via pip when requests/urllib3 are already installed via the system packages. Forwarded: not-needed Bug-OpenStack: https://review.openstack.org/#/c/213310/0 Bug-Upstream: https://github.com/kennethreitz/requests/issues/2816 Patch-Name: 02_populate-install_requires.patch
-rwxr-xr-xsetup.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index eb444f1..6f62b80 100755
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,9 @@ packages = [
'requests.packages.urllib3.packages.ssl_match_hostname',
]
-requires = []
+requires = [
+ 'urllib3==1.12',
+]
version = ''
with open('requests/__init__.py', 'r') as fd: