aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorDaniele Tricoli <eriol@mornie.org>2015-10-23 16:09:18 +0200
committerDaniele Tricoli <eriol@mornie.org>2015-10-23 16:09:18 +0200
commit86eb67cfced6246d99f6aa059ea01af560df337e (patch)
tree91575727e1df41beb649d0db2a4bc8b14f03cbf1 /debian/patches
parentd3161bbeef0171a98941287e8d276c451b4be401 (diff)
parent6c882aca203bd33c129e2b4e1e4f82886e4b1fe0 (diff)
downloadpython-requests-86eb67cfced6246d99f6aa059ea01af560df337e.tar
python-requests-86eb67cfced6246d99f6aa059ea01af560df337e.tar.gz
merge patched into master
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/02_populate-install_requires.patch31
-rw-r--r--debian/patches/series1
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/02_populate-install_requires.patch b/debian/patches/02_populate-install_requires.patch
new file mode 100644
index 0000000..64ec706
--- /dev/null
+++ b/debian/patches/02_populate-install_requires.patch
@@ -0,0 +1,31 @@
+From 6c882aca203bd33c129e2b4e1e4f82886e4b1fe0 Mon Sep 17 00:00:00 2001
+From: Daniele Tricoli <eriol@mornie.org>
+Date: Fri, 23 Oct 2015 16:03:52 +0200
+Subject: 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
+---
+ setup.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+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:
diff --git a/debian/patches/series b/debian/patches/series
index b255d11..b57f725 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_use-system-ca-certificates.patch
03_export-IncompleteRead.patch
+02_populate-install_requires.patch