[Python-modules-commits] r31382 - in packages/python-docker/trunk/debian (5 files)

[tianon-guest at users.alioth.debian.org]

    Date: Monday, November 3, 2014 @ 23:10:20
  Author: tianon-guest
Revision: 31382

Apply patch from #767445 that fixes urllib issues (thanks Kuba! :D)

Added:
  packages/python-docker/trunk/debian/patches/01_requirements.patch
    (from rev 31107, packages/python-docker/trunk/debian/patches/requirements.patch)
  packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch
Modified:
  packages/python-docker/trunk/debian/changelog
  packages/python-docker/trunk/debian/patches/series
Deleted:
  packages/python-docker/trunk/debian/patches/requirements.patch

Modified: packages/python-docker/trunk/debian/changelog
===================================================================
--- packages/python-docker/trunk/debian/changelog	2014-11-03 22:48:21 UTC (rev 31381)
+++ packages/python-docker/trunk/debian/changelog	2014-11-03 23:10:20 UTC (rev 31382)
@@ -1,3 +1,13 @@
+python-docker (0.5.3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Added debian/patches/02_use-system-urllib3.patch (Closes: #767445).
+  * Renamed debian/patches/requirements.patch to
+    debian/patches/01_requirements.patch following convention from other
+    Python packages.
+
+ -- Jakub Warmuz <jakub at warmuz.org>  Sat, 01 Nov 2014 18:19:57 +0100
+
 python-docker (0.5.3-1) unstable; urgency=medium
 
   * Update to 0.5.3 upstream release

Copied: packages/python-docker/trunk/debian/patches/01_requirements.patch (from rev 31107, packages/python-docker/trunk/debian/patches/requirements.patch)
===================================================================
--- packages/python-docker/trunk/debian/patches/01_requirements.patch	                        (rev 0)
+++ packages/python-docker/trunk/debian/patches/01_requirements.patch	2014-11-03 23:10:20 UTC (rev 31382)
@@ -0,0 +1,22 @@
+Author: Tianon Gravi <admwiggin at gmail.com>
+Forwarded: https://github.com/dotcloud/docker-py/issues/101 (upstream has no interest)
+Description: unpin dependencies so newer versions satisfy them appropriately
+
+diff --git a/requirements.txt b/requirements.txt
+index a1cc1af..d4920a7 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,3 +1,3 @@
+-requests==2.2.1
++requests>=2.2.1
+ six>=1.3.0
+-websocket-client==0.11.0
++websocket-client>=0.11.0
+diff --git a/requirements3.txt b/requirements3.txt
+index 68533d1..ab74f44 100644
+--- a/requirements3.txt
++++ b/requirements3.txt
+@@ -1,2 +1,2 @@
+-requests==2.2.1
++requests>=2.2.1
+ six>=1.3.0

Added: packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch
===================================================================
--- packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch	                        (rev 0)
+++ packages/python-docker/trunk/debian/patches/02_use-system-urllib3.patch	2014-11-03 23:10:20 UTC (rev 31382)
@@ -0,0 +1,33 @@
+Description: Use the system python-urllib3 instead of the
+ requests.packages.urllib3.
+Author: Jakub Warmuz <jakub at warmuz.org>
+Last-Update: 2014-11-01
+
+--- a/docker/ssladapter/ssladapter.py
++++ b/docker/ssladapter/ssladapter.py
+@@ -4,10 +4,7 @@
+ """
+ from distutils.version import StrictVersion
+ from requests.adapters import HTTPAdapter
+-try:
+-    import requests.packages.urllib3 as urllib3
+-except ImportError:
+-    import urllib3
++import urllib3
+ 
+ 
+ PoolManager = urllib3.poolmanager.PoolManager
+--- a/docker/unixconn/unixconn.py
++++ b/docker/unixconn/unixconn.py
+@@ -20,10 +20,7 @@
+ import requests.adapters
+ import socket
+ 
+-try:
+-    import requests.packages.urllib3.connectionpool as connectionpool
+-except ImportError:
+-    import urllib3.connectionpool as connectionpool
++import urllib3.connectionpool as connectionpool
+ 
+ 
+ class UnixHTTPConnection(httplib.HTTPConnection, object):

Deleted: packages/python-docker/trunk/debian/patches/requirements.patch
===================================================================
--- packages/python-docker/trunk/debian/patches/requirements.patch	2014-11-03 22:48:21 UTC (rev 31381)
+++ packages/python-docker/trunk/debian/patches/requirements.patch	2014-11-03 23:10:20 UTC (rev 31382)
@@ -1,22 +0,0 @@
-Author: Tianon Gravi <admwiggin at gmail.com>
-Forwarded: https://github.com/dotcloud/docker-py/issues/101 (upstream has no interest)
-Description: unpin dependencies so newer versions satisfy them appropriately
-
-diff --git a/requirements.txt b/requirements.txt
-index a1cc1af..d4920a7 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,3 +1,3 @@
--requests==2.2.1
-+requests>=2.2.1
- six>=1.3.0
--websocket-client==0.11.0
-+websocket-client>=0.11.0
-diff --git a/requirements3.txt b/requirements3.txt
-index 68533d1..ab74f44 100644
---- a/requirements3.txt
-+++ b/requirements3.txt
-@@ -1,2 +1,2 @@
--requests==2.2.1
-+requests>=2.2.1
- six>=1.3.0

Modified: packages/python-docker/trunk/debian/patches/series
===================================================================
--- packages/python-docker/trunk/debian/patches/series	2014-11-03 22:48:21 UTC (rev 31381)
+++ packages/python-docker/trunk/debian/patches/series	2014-11-03 23:10:20 UTC (rev 31382)
@@ -1,2 +1,4 @@
 # see https://github.com/dotcloud/docker-py/issues/101
-requirements.patch
+01_requirements.patch
+# see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767445
+02_use-system-urllib3.patch