[Python-modules-commits] [python-docker] 04/05: merge patched into master
Ondřej Nový
onovy-guest at moszumanska.debian.org
Wed Mar 23 06:29:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy-guest pushed a commit to branch master
in repository python-docker.
commit 4153379454be8e30d71eacdbe4732555e108af70
Merge: 8801161 91cb802
Author: Ondřej Nový <novy at ondrej.org>
Date: Wed Mar 23 07:23:42 2016 +0100
merge patched into master
PKG-INFO | 3 +-
debian/.git-dpm | 6 +-
...apter-bug-with-newer-versions-of-requests.patch | 43 -
debian/patches/requirements.patch | 4 +-
debian/patches/series | 1 -
docker/api/build.py | 11 +-
docker/api/container.py | 37 +-
docker/api/exec_api.py | 19 +-
docker/api/image.py | 5 +-
docker/api/network.py | 30 +-
docker/api/volume.py | 5 +-
docker/auth/auth.py | 194 +-
docker/client.py | 34 +-
docker/constants.py | 2 +-
docker/errors.py | 4 +-
docker/ssladapter/ssladapter.py | 26 +-
docker/tls.py | 38 +-
docker/utils/__init__.py | 7 +-
docker/utils/decorators.py | 11 +
docker/utils/utils.py | 403 ++--
docker/version.py | 2 +-
docker_py.egg-info/PKG-INFO | 3 +-
docker_py.egg-info/SOURCES.txt | 28 +-
setup.cfg | 3 +
setup.py | 1 -
tests/base.py | 25 +
tests/helpers.py | 148 ++
tests/integration/__init__.py | 0
tests/integration/api_test.py | 176 ++
tests/integration/build_test.py | 140 ++
tests/integration/conftest.py | 31 +
tests/integration/container_test.py | 1033 ++++++++++
tests/integration/exec_test.py | 130 ++
tests/integration/image_test.py | 235 +++
tests/integration/network_test.py | 237 +++
tests/integration/regression_test.py | 69 +
tests/integration/volume_test.py | 55 +
tests/integration_test.py | 1971 --------------------
tests/unit/__init__.py | 0
tests/unit/api_test.py | 417 +++++
tests/unit/auth_test.py | 464 +++++
tests/unit/build_test.py | 105 ++
tests/{test.py => unit/container_test.py} | 1668 +++--------------
tests/unit/exec_test.py | 75 +
tests/{ => unit}/fake_api.py | 2 +-
tests/{ => unit}/fake_stat.py | 0
tests/unit/image_test.py | 346 ++++
tests/unit/network_test.py | 187 ++
tests/{ => unit}/utils_test.py | 602 +++---
tests/unit/volume_test.py | 96 +
50 files changed, 5154 insertions(+), 3978 deletions(-)
diff --cc debian/.git-dpm
index 35e8844,0000000..87ae18b
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
- 06f1e6fdcf6eb6a33f067d2b35ccc5c84cdbfaf5
- 06f1e6fdcf6eb6a33f067d2b35ccc5c84cdbfaf5
- 0db60a1e341b25c36bebb5903f0ce87126d7eee4
++91cb802b9ddffb1351959b1c3797adc525595ea5
++91cb802b9ddffb1351959b1c3797adc525595ea5
++63875477fa2e0a529fcf52e36a3f9cb3db861000
+63875477fa2e0a529fcf52e36a3f9cb3db861000
+python-docker_1.7.2.orig.tar.gz
+bc4f33cac9d6ad13c41ac7ff3e76de30fef8c4cf
+68199
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/requirements.patch
index a6f3f87,0000000..86cc240
mode 100644,000000..100644
--- a/debian/patches/requirements.patch
+++ b/debian/patches/requirements.patch
@@@ -1,67 -1,0 +1,67 @@@
- From 45baca4b0272e2840e041d822315cf15f1343d49 Mon Sep 17 00:00:00 2001
++From 91cb802b9ddffb1351959b1c3797adc525595ea5 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 ++--
+ 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
+--- a/docker_py.egg-info/requires.txt
++++ b/docker_py.egg-info/requires.txt
+@@ -1,3 +1,3 @@
+-requests >= 2.5.2
++requests >= 2.5.3
+ six >= 1.4.0
+-websocket-client >= 0.32.0
++websocket-client >= 0.18.0
+diff --git a/requirements.txt b/requirements.txt
+index 72c255d..cd79880 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1,3 +1,3 @@
+-requests==2.5.3
++requests>=2.5.3
+ six>=1.4.0
+-websocket-client==0.32.0
++websocket-client>=0.18.0
+diff --git a/setup.py b/setup.py
- index 1d0a842..3de226b 100644
++index 6d86163..f2af6b9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -7,9 +7,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())
+diff --git a/test-requirements.txt b/test-requirements.txt
+index be49988..45b2b38 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -1,5 +1,5 @@
+-mock==1.0.1
+-pytest==2.7.2
+-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
++coverage>=3.7.1
++pytest-cov>=2.1.0
++flake8>=2.4.1
diff --cc debian/patches/series
index c03fae9,0000000..f499a22
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
+requirements.patch
- 0002-Fix-Unix-adapter-bug-with-newer-versions-of-requests.patch
--
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