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

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

    Date: Tuesday, May 5, 2015 @ 06:20:48
  Author: tianon-guest
Revision: 32597

Update Build-Depends, 01_requirements.patch, and comment in debian/rules regarding tests

Modified:
  packages/python-docker/trunk/debian/changelog
  packages/python-docker/trunk/debian/control
  packages/python-docker/trunk/debian/patches/01_requirements.patch
  packages/python-docker/trunk/debian/rules

Modified: packages/python-docker/trunk/debian/changelog
===================================================================
--- packages/python-docker/trunk/debian/changelog	2015-05-05 06:20:38 UTC (rev 32596)
+++ packages/python-docker/trunk/debian/changelog	2015-05-05 06:20:48 UTC (rev 32597)
@@ -2,6 +2,8 @@
 
   * Update to 1.2.2 upstream release
   * Update debian/watch to use the pypi.debian.net redirector
+  * Update Build-Depends, 01_requirements.patch, and comment in debian/rules
+    regarding tests
 
  -- Tianon Gravi <admwiggin at gmail.com>  Sun, 29 Mar 2015 19:58:18 -0600
 

Modified: packages/python-docker/trunk/debian/control
===================================================================
--- packages/python-docker/trunk/debian/control	2015-05-05 06:20:38 UTC (rev 32596)
+++ packages/python-docker/trunk/debian/control	2015-05-05 06:20:48 UTC (rev 32597)
@@ -6,15 +6,22 @@
  Docker Packaging Team <docker-maint at lists.alioth.debian.org>,
  Tianon Gravi <admwiggin at gmail.com>
 Build-Depends: debhelper (>= 9),
+ dh-python,
  python-all (>= 2.6.6-3~),
+ python3-all (>= 3.1.2~),
  python-setuptools,
- python-requests,
- python-six,
- python-websocket,
- python3-all (>= 3.1.2),
  python3-setuptools,
- python3-requests,
- python3-six,
+# requirements.txt
+ python-requests (>= 2.5.3~),
+ python-six (>= 1.3.0~),
+ python-websocket (>= 0.11.0~),
+# requirements3.txt
+ python3-requests (>= 2.5.3~),
+ python3-six (>= 1.3.0~),
+# test-requirements.txt
+# python-mock (>= 1.0.1~),
+# python-coverage (>= 3.7.1~),
+# docker.io,
 Standards-Version: 3.9.6
 Homepage: https://github.com/dotcloud/docker-py/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-docker/trunk/

Modified: packages/python-docker/trunk/debian/patches/01_requirements.patch
===================================================================
--- packages/python-docker/trunk/debian/patches/01_requirements.patch	2015-05-05 06:20:38 UTC (rev 32596)
+++ packages/python-docker/trunk/debian/patches/01_requirements.patch	2015-05-05 06:20:48 UTC (rev 32597)
@@ -2,21 +2,30 @@
 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
+Index: python-docker/requirements.txt
+===================================================================
+--- python-docker.orig/requirements.txt
++++ python-docker/requirements.txt
 @@ -1,3 +1,3 @@
--requests==2.2.1
-+requests>=2.2.1
+-requests==2.5.3
++requests>=2.5.3
  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
+Index: python-docker/requirements3.txt
+===================================================================
+--- python-docker.orig/requirements3.txt
++++ python-docker/requirements3.txt
 @@ -1,2 +1,2 @@
--requests==2.2.1
-+requests>=2.2.1
+-requests==2.5.3
++requests>=2.5.3
  six>=1.3.0
+Index: python-docker/test-requirements.txt
+===================================================================
+--- python-docker.orig/test-requirements.txt
++++ python-docker/test-requirements.txt
+@@ -1,2 +1,2 @@
+-mock==1.0.1
+-coverage==3.7.1
++mock>=1.0.1
++coverage>=3.7.1

Modified: packages/python-docker/trunk/debian/rules
===================================================================
--- packages/python-docker/trunk/debian/rules	2015-05-05 06:20:38 UTC (rev 32596)
+++ packages/python-docker/trunk/debian/rules	2015-05-05 06:20:48 UTC (rev 32597)
@@ -2,8 +2,7 @@
 
 export PYBUILD_NAME=docker
 
-# The pypi bundle does not include the tests, so we have to disable them.
-# see also https://github.com/docker/docker-py/issues/308
+# The pypi bundle includes the tests (https://github.com/docker/docker-py/issues/308), but they're really invasive and fail for reasons I haven't yet diagnosed.
 export PYBUILD_DISABLE=test
 
 %: