[Python-modules-commits] [python-docker] 04/05: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Fri Oct 7 21:31:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository python-docker.
commit 45fdbd02be7a7e056e8b9d61956b715e17e92ce1
Merge: 9f5dbd3 8eddee1
Author: Ondřej Nový <onovy at debian.org>
Date: Fri Oct 7 22:57:56 2016 +0200
merge patched into master
LICENSE | 13 +-
MANIFEST.in | 1 +
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
debian/patches/requirements.patch | 12 +-
docker/__init__.py | 14 --
docker/api/__init__.py | 4 +-
docker/api/build.py | 6 +-
docker/api/container.py | 25 ++-
docker/api/exec_api.py | 14 +-
docker/api/image.py | 216 ++++++++++++-------------
docker/api/network.py | 35 +++-
docker/api/service.py | 105 ++++++++++++
docker/api/swarm.py | 78 +++++++++
docker/api/volume.py | 13 +-
docker/auth/auth.py | 98 ++++++++---
docker/client.py | 70 +++++---
docker/constants.py | 3 +-
docker/errors.py | 13 --
docker/transport/npipeconn.py | 10 +-
docker/transport/npipesocket.py | 2 +-
docker/transport/unixconn.py | 33 ++--
docker/types/__init__.py | 7 +
docker/types/base.py | 7 +
docker/{utils/types.py => types/containers.py} | 8 +-
docker/types/services.py | 181 +++++++++++++++++++++
docker/types/swarm.py | 40 +++++
docker/utils/__init__.py | 14 +-
docker/utils/decorators.py | 4 +-
docker/utils/socket.py | 68 ++++++++
docker/utils/types.py | 97 +----------
docker/utils/utils.py | 145 ++++++++++++-----
docker/version.py | 2 +-
docker_py.egg-info/PKG-INFO | 2 +-
docker_py.egg-info/SOURCES.txt | 10 ++
docker_py.egg-info/requires.txt | 3 +-
requirements.txt | 1 +
setup.cfg | 3 +
setup.py | 6 +-
tests/helpers.py | 55 -------
tests/integration/container_test.py | 48 ++++--
tests/integration/exec_test.py | 28 +---
tests/integration/image_test.py | 42 +++++
tests/integration/network_test.py | 78 ++++++++-
tests/integration/service_test.py | 189 ++++++++++++++++++++++
tests/integration/swarm_test.py | 145 +++++++++++++++++
tests/unit/api_test.py | 73 ++++++---
tests/unit/auth_test.py | 26 ++-
tests/unit/build_test.py | 61 ++++++-
tests/unit/client_test.py | 8 +
tests/unit/container_test.py | 117 +++++++++++++-
tests/unit/exec_test.py | 32 +++-
tests/unit/fake_api.py | 50 +-----
tests/unit/image_test.py | 26 +++
tests/unit/network_test.py | 2 +-
tests/unit/utils_test.py | 96 ++++++++++-
tests/unit/volume_test.py | 16 ++
57 files changed, 1891 insertions(+), 572 deletions(-)
diff --cc debian/.git-dpm
index a9c9954,0000000..9a5a788
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
- dacca4f59a667aa6c9893fd2bd264a7c42097a36
- dacca4f59a667aa6c9893fd2bd264a7c42097a36
- 49556cb01423a89a6d2ce7a58b1f5cb64dde0ff3
++8eddee114f94f380e67231ff532825f0fe5acbb9
++8eddee114f94f380e67231ff532825f0fe5acbb9
++5d8d4569fb7b4e869d9c88fa0f7f703c38f8131e
+5d8d4569fb7b4e869d9c88fa0f7f703c38f8131e
+python-docker_1.10.3.orig.tar.gz
+963fd348ed1188b48450285a1df29af54d7c9a37
+82610
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/requirements.patch
index c75a1fc,0000000..386c0a9
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,42 -1,0 +1,44 @@@
- From dacca4f59a667aa6c9893fd2bd264a7c42097a36 Mon Sep 17 00:00:00 2001
++From 8eddee114f94f380e67231ff532825f0fe5acbb9 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
+---
- requirements.txt | 6 +++---
++ requirements.txt | 8 ++++----
+ test-requirements.txt | 10 +++++-----
- 2 files changed, 8 insertions(+), 8 deletions(-)
++ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
- index a79b7bf..12b88f6 100644
++index 1e52846..4695b65 100644
+--- a/requirements.txt
++++ b/requirements.txt
- @@ -1,5 +1,5 @@
++@@ -1,6 +1,6 @@
+-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'
++-docker-pycreds==0.2.1
+\ No newline at end of file
++ipaddress>=1.0.16 ; python_version < '3.3'
+++docker-pycreds>=0.2.1
+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
More information about the Python-modules-commits
mailing list