[Python-modules-commits] [python-docker] 09/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 ae4d635c87816719df6e7ddaa741c7cb9f953b0f
Merge: c70e3b8 dacca4f
Author: Ondřej Nový <onovy at debian.org>
Date:   Thu Sep 8 14:28:24 2016 +0200

    merge patched into master

 debian/.git-dpm                   |  4 ++--
 debian/patches/requirements.patch | 36 ++++--------------------------------
 docker_py.egg-info/requires.txt   |  2 +-
 setup.py                          |  4 ++--
 4 files changed, 9 insertions(+), 37 deletions(-)

diff --cc debian/.git-dpm
index 4625d52,0000000..89c532a
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
- 5fcb828d4e26af57aaf443c1608f554f6e4c5d3d
- 5fcb828d4e26af57aaf443c1608f554f6e4c5d3d
++dacca4f59a667aa6c9893fd2bd264a7c42097a36
++dacca4f59a667aa6c9893fd2bd264a7c42097a36
 +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 c06b783,0000000..c75a1fc
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,70 -1,0 +1,42 @@@
- From 5fcb828d4e26af57aaf443c1608f554f6e4c5d3d Mon Sep 17 00:00:00 2001
++From dacca4f59a667aa6c9893fd2bd264a7c42097a36 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(-)
++ requirements.txt      |  6 +++---
++ test-requirements.txt | 10 +++++-----
++ 2 files changed, 8 insertions(+), 8 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..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'
- 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

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