diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2015-10-23 16:09:18 +0200 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2015-10-23 16:09:18 +0200 |
| commit | 86eb67cfced6246d99f6aa059ea01af560df337e (patch) | |
| tree | 91575727e1df41beb649d0db2a4bc8b14f03cbf1 | |
| parent | d3161bbeef0171a98941287e8d276c451b4be401 (diff) | |
| parent | 6c882aca203bd33c129e2b4e1e4f82886e4b1fe0 (diff) | |
| download | python-requests-86eb67cfced6246d99f6aa059ea01af560df337e.tar python-requests-86eb67cfced6246d99f6aa059ea01af560df337e.tar.gz | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/02_populate-install_requires.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | setup.py | 4 |
4 files changed, 37 insertions, 3 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index a57df0b..9a52d08 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -3d3afa49b9ca0e898ecb09c7271d28e0c737016b -3d3afa49b9ca0e898ecb09c7271d28e0c737016b +6c882aca203bd33c129e2b4e1e4f82886e4b1fe0 +6c882aca203bd33c129e2b4e1e4f82886e4b1fe0 cb40ec082506c0d9eb05978839bed2f12541af35 cb40ec082506c0d9eb05978839bed2f12541af35 requests_2.8.1.orig.tar.gz 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 @@ -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: |