From 8f38b288168a6f8ce4c7df8275cbebb5fdfa73df Mon Sep 17 00:00:00 2001
From: Zoltan Nagy <abesto@abesto.net>
Date: Fri, 20 Feb 2015 17:18:51 +0100
Subject: [PATCH] Use docker-py 1.0.0
Signed-off-by: Zoltan Nagy <abesto@abesto.net>
---
requirements.txt | 2 +-
setup.py | 2 +-
tests/unit/cli/docker_client_test.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index a31a19ae9..ecfcd2c5b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
PyYAML==3.10
-docker-py==0.7.1
+docker-py==1.0.0
dockerpty==0.3.2
docopt==0.6.1
requests==2.2.1
diff --git a/setup.py b/setup.py
index e1e29744b..4cbffd5f3 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ install_requires = [
'requests >= 2.2.1, < 3',
'texttable >= 0.8.1, < 0.9',
'websocket-client >= 0.11.0, < 1.0',
- 'docker-py >= 0.6.0, < 0.8',
+ 'docker-py >= 1.0.0, < 1.1.0',
'dockerpty >= 0.3.2, < 0.4',
'six >= 1.3.0, < 2',
]
diff --git a/tests/unit/cli/docker_client_test.py b/tests/unit/cli/docker_client_test.py
index abd40ef08..184aff4de 100644
--- a/tests/unit/cli/docker_client_test.py
+++ b/tests/unit/cli/docker_client_test.py
@@ -19,4 +19,4 @@ class DockerClientTestCase(unittest.TestCase):
with mock.patch.dict(os.environ):
os.environ['DOCKER_CLIENT_TIMEOUT'] = timeout = "300"
client = docker_client.docker_client()
- self.assertEqual(client._timeout, int(timeout))
+ self.assertEqual(client.timeout, int(timeout))