[Python-modules-commits] [python-docker] 07/13: merge patched into master

[Ondřej Nový]

This is an automated email from the git hooks/post-receive script.

onovy pushed a commit to branch master
in repository python-docker.

commit c70e3b8d0d696e34692747a6d5fa528582b07785
Merge: 08afb27 5fcb828
Author: Ondřej Nový <onovy at debian.org>
Date:   Thu Sep 8 14:26:51 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...r-API-version-to-1.20-for-Docker-1.8.3-co.patch | 22 ----------------------
 debian/patches/requirements.patch                  |  6 +++---
 debian/patches/series                              |  1 -
 docker/constants.py                                |  2 +-
 requirements.txt                                   |  2 +-
 6 files changed, 7 insertions(+), 30 deletions(-)

diff --cc debian/.git-dpm
index 872177f,0000000..4625d52
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- be343351f9237abe05da5f9f57e5409fdcf531f4
- be343351f9237abe05da5f9f57e5409fdcf531f4
++5fcb828d4e26af57aaf443c1608f554f6e4c5d3d
++5fcb828d4e26af57aaf443c1608f554f6e4c5d3d
 +49556cb01423a89a6d2ce7a58b1f5cb64dde0ff3
 +49556cb01423a89a6d2ce7a58b1f5cb64dde0ff3
 +python-docker_1.9.0.orig.tar.gz
 +8ae12366415c9d017ce464eb721e01d3489bff28
 +75137
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/requirements.patch
index 824d621,0000000..c06b783
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,70 -1,0 +1,70 @@@
- From 5de320ded0f8b25f62e19b971341506d31db371c Mon Sep 17 00:00:00 2001
++From 5fcb828d4e26af57aaf443c1608f554f6e4c5d3d Mon Sep 17 00:00:00 2001
 +From: Tianon Gravi <tianon at debian.org>
 +Date: Sun, 8 Nov 2015 10:36:49 -0800
 +Subject: Unpin dependencies so newer versions satisfy them appropriately
 +
 +Forwarded: https://github.com/dotcloud/docker-py/issues/101 (upstream has no interest)
 +
 +Patch-Name: requirements.patch
 +---
 + docker_py.egg-info/requires.txt |  2 +-
 + requirements.txt                |  6 +++---
 + setup.py                        |  4 ++--
 + test-requirements.txt           | 10 +++++-----
 + 4 files changed, 11 insertions(+), 11 deletions(-)
 +
 +diff --git a/docker_py.egg-info/requires.txt b/docker_py.egg-info/requires.txt
 +index 111527c..c3febfb 100644
 +--- a/docker_py.egg-info/requires.txt
 ++++ b/docker_py.egg-info/requires.txt
 +@@ -1,4 +1,4 @@
 +-requests >= 2.5.2
 ++requests >= 2.5.3
 + six >= 1.4.0
 + websocket-client >= 0.32.0
 + 
 +diff --git a/requirements.txt b/requirements.txt
- index a79b7bf..b06a541 100644
++index a79b7bf..12b88f6 100644
 +--- a/requirements.txt
 ++++ b/requirements.txt
 +@@ -1,5 +1,5 @@
 +-requests==2.5.3
 ++requests>=2.5.3
 + six>=1.4.0
 +-websocket-client==0.32.0
 ++websocket-client>=0.32.0
 + backports.ssl_match_hostname>=3.5 ; python_version < '3.5'
 +-ipaddress==1.0.16 ; python_version < '3.3'
 +\ No newline at end of file
- +ipaddress==1.0.16 ; python_version < '3.3'
+++ipaddress>=1.0.16 ; python_version < '3.3'
 +diff --git a/setup.py b/setup.py
 +index ac58b1f..f7c0443 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -9,9 +9,9 @@ ROOT_DIR = os.path.dirname(__file__)
 + SOURCE_DIR = os.path.join(ROOT_DIR)
 + 
 + requirements = [
 +-    'requests >= 2.5.2',
 ++    'requests >= 2.5.3',
 +     'six >= 1.4.0',
 +-    'websocket-client >= 0.32.0',
 ++    'websocket-client >= 0.18.0',
 + ]
 + 
 + if sys.platform == 'win32':
 +diff --git a/test-requirements.txt b/test-requirements.txt
 +index 460db10..9f9eb50 100644
 +--- a/test-requirements.txt
 ++++ b/test-requirements.txt
 +@@ -1,5 +1,5 @@
 +-mock==1.0.1
 +-pytest==2.9.1
 +-coverage==3.7.1
 +-pytest-cov==2.1.0
 +-flake8==2.4.1
 ++mock>=1.0.1
 ++pytest>=2.9.1
 ++coverage>=3.7.1
 ++pytest-cov>=2.1.0
 ++flake8>=2.4.1
diff --cc debian/patches/series
index 8dda60b,0000000..f499a22
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +requirements.patch
- 0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-docker.git