[Python-modules-commits] [python-docker] 05/13: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Thu Sep 8 12:38:54 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 08afb27969ed9291f7aecb24e811c9f135b7c08d
Merge: 8f8b69b be34335
Author: Ondřej Nový <onovy at debian.org>
Date: Thu Sep 8 14:23:57 2016 +0200
merge patched into master
MANIFEST.in | 2 +
PKG-INFO | 5 +-
README.md | 8 +-
README.rst | 37 +++
debian/.git-dpm | 6 +-
...r-API-version-to-1.20-for-Docker-1.8.3-co.patch | 11 +-
debian/patches/requirements.patch | 37 +--
docker/__init__.py | 2 +-
docker/api/build.py | 11 +-
docker/api/container.py | 46 +++-
docker/api/daemon.py | 4 +-
docker/api/image.py | 8 +-
docker/api/network.py | 25 +-
docker/auth/auth.py | 15 +-
docker/client.py | 67 +++++-
docker/constants.py | 7 +
docker/ssladapter/ssladapter.py | 9 +
docker/tls.py | 7 +-
docker/transport/__init__.py | 6 +
docker/transport/npipeconn.py | 80 +++++++
docker/transport/npipesocket.py | 191 +++++++++++++++
docker/{unixconn => transport}/unixconn.py | 8 +-
docker/unixconn/__init__.py | 1 -
docker/utils/utils.py | 258 +++++++++++++++------
docker/version.py | 2 +-
docker_py.egg-info/PKG-INFO | 5 +-
docker_py.egg-info/SOURCES.txt | 15 +-
docker_py.egg-info/pbr.json | 1 -
docker_py.egg-info/requires.txt | 8 +-
requirements.txt | 4 +-
setup.py | 17 +-
test-requirements.txt | 2 +-
tests/integration/api_test.py | 2 +-
tests/integration/build_test.py | 28 +++
tests/integration/container_test.py | 92 +++++++-
tests/integration/image_test.py | 14 ++
tests/integration/network_test.py | 141 ++++++++++-
tests/unit/api_test.py | 30 +++
tests/unit/auth_test.py | 5 +-
tests/unit/client_test.py | 70 ++++++
tests/unit/container_test.py | 129 ++++++++++-
tests/unit/fake_api.py | 7 +
tests/unit/image_test.py | 3 +-
tests/unit/ssladapter_test.py | 79 +++++++
tests/unit/testdata/certs/ca.pem | 0
tests/unit/testdata/certs/cert.pem | 0
tests/unit/testdata/certs/key.pem | 0
tests/unit/utils_test.py | 174 +++++++-------
48 files changed, 1421 insertions(+), 258 deletions(-)
diff --cc debian/.git-dpm
index f926a07,0000000..872177f
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
- 07e7d1cfb5d89ae7d71d9c4b18e2a64ad47658e5
- 07e7d1cfb5d89ae7d71d9c4b18e2a64ad47658e5
- 63875477fa2e0a529fcf52e36a3f9cb3db861000
++be343351f9237abe05da5f9f57e5409fdcf531f4
++be343351f9237abe05da5f9f57e5409fdcf531f4
++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/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch
index fca3ee3,0000000..3d64ad5
mode 100644,000000..100644
--- a/debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch
+++ b/debian/patches/0002-Lower-Docker-API-version-to-1.20-for-Docker-1.8.3-co.patch
@@@ -1,19 -1,0 +1,22 @@@
- From 07e7d1cfb5d89ae7d71d9c4b18e2a64ad47658e5 Mon Sep 17 00:00:00 2001
++From be343351f9237abe05da5f9f57e5409fdcf531f4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <novy at ondrej.org>
+Date: Tue, 29 Mar 2016 21:48:58 +0200
+Subject: Lower Docker API version to 1.20 for Docker 1.8.3 compatibility
+
+---
+ docker/constants.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docker/constants.py b/docker/constants.py
- index 0627ba0..3647a3b 100644
++index 904d50e..3726824 100644
+--- a/docker/constants.py
++++ b/docker/constants.py
- @@ -1,4 +1,4 @@
- -DEFAULT_DOCKER_API_VERSION = '1.21'
++@@ -1,7 +1,7 @@
++ import sys
++ from .version import version
++
++-DEFAULT_DOCKER_API_VERSION = '1.22'
++DEFAULT_DOCKER_API_VERSION = '1.20'
+ DEFAULT_TIMEOUT_SECONDS = 60
+ STREAM_HEADER_SIZE_BYTES = 8
+ CONTAINER_LIMITS_KEYS = [
diff --cc debian/patches/requirements.patch
index 86cc240,0000000..824d621
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,67 -1,0 +1,70 @@@
- From 91cb802b9ddffb1351959b1c3797adc525595ea5 Mon Sep 17 00:00:00 2001
++From 5de320ded0f8b25f62e19b971341506d31db371c 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 | 4 ++--
- requirements.txt | 4 ++--
++ 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 43cfa6a..aa5b97e 100644
++index 111527c..c3febfb 100644
+--- a/docker_py.egg-info/requires.txt
++++ b/docker_py.egg-info/requires.txt
- @@ -1,3 +1,3 @@
++@@ -1,4 +1,4 @@
+-requests >= 2.5.2
++requests >= 2.5.3
+ six >= 1.4.0
- -websocket-client >= 0.32.0
- +websocket-client >= 0.18.0
++ websocket-client >= 0.32.0
++
+diff --git a/requirements.txt b/requirements.txt
- index 72c255d..cd79880 100644
++index a79b7bf..b06a541 100644
+--- a/requirements.txt
++++ b/requirements.txt
- @@ -1,3 +1,3 @@
++@@ -1,5 +1,5 @@
+-requests==2.5.3
++requests>=2.5.3
+ six>=1.4.0
+-websocket-client==0.32.0
- +websocket-client>=0.18.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 6d86163..f2af6b9 100644
++index ac58b1f..f7c0443 100644
+--- a/setup.py
++++ b/setup.py
- @@ -7,9 +7,9 @@ ROOT_DIR = os.path.dirname(__file__)
++@@ -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',
+ ]
+
- exec(open('docker/version.py').read())
++ if sys.platform == 'win32':
+diff --git a/test-requirements.txt b/test-requirements.txt
- index be49988..45b2b38 100644
++index 460db10..9f9eb50 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -1,5 +1,5 @@
+-mock==1.0.1
- -pytest==2.7.2
++-pytest==2.9.1
+-coverage==3.7.1
+-pytest-cov==2.1.0
+-flake8==2.4.1
- \ No newline at end of file
++mock>=1.0.1
- +pytest>=2.7.2
+++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