From 7984d87eeff75a6201bd0d655e98b10e5a6a9519 Mon Sep 17 00:00:00 2001 From: mjbright Date: Thu, 4 May 2017 20:28:16 +0200 Subject: [PATCH 1/2] Updated to use 'docker' module No longer use obsolete 'docker-py' version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6c79f0d..ad8c996 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ __version__ = "0.2.2" install_requires = [ - 'docker-py', + 'docker', ] setup( From 46642b59932008fe278f1c39eed8168c6abbcc70 Mon Sep 17 00:00:00 2001 From: mjbright Date: Fri, 5 May 2017 20:09:10 +0200 Subject: [PATCH 2/2] Modified to use docker.APIClient in place of docker.Client --- README.rst | 2 +- tests/test_commands.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 176355d..7d4c3bf 100644 --- a/README.rst +++ b/README.rst @@ -31,7 +31,7 @@ usage import machine import docker m = machine.Machine(path="/usr/local/bin/docker-machine") - client = docker.Client(**m.config(machine='default')) + client = docker.APIClient(**m.config(machine='default')) client.ping() diff --git a/tests/test_commands.py b/tests/test_commands.py index 08400fa..66ff04d 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -43,7 +43,7 @@ def test_active(self): def test_config(self): config = self.machine.config(machine=TEST_MACHINE) - client = docker.Client(**config) + client = docker.APIClient(**config) self.assertTrue(client.ping())