From 814b64c11e6fb6fd84a6f269d99bcbfe4795a3b6 Mon Sep 17 00:00:00 2001
From: Sam <samnap+github@gmail.com>
Date: Tue, 6 Mar 2018 09:42:10 -0500
Subject: [PATCH] Port from 'docker-py' library to renamed 'docker' library.
 Use docker.APIClient as object to interface with.

---
 docker_custodian/docker_autostop.py | 2 +-
 docker_custodian/docker_gc.py       | 2 +-
 setup.py                            | 2 +-
 tests/conftest.py                   | 4 ++--
 tests/docker_gc_test.py             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker_custodian/docker_autostop.py b/docker_custodian/docker_autostop.py
index 780ff40..788f1d6 100644
--- a/docker_custodian/docker_autostop.py
+++ b/docker_custodian/docker_autostop.py
@@ -66,7 +66,7 @@ def main():
         stream=sys.stdout)
 
     opts = get_opts()
-    client = docker.Client(version='auto', timeout=opts.timeout)
+    client = docker.APIClient(version='auto', timeout=opts.timeout)
 
     matcher = build_container_matcher(opts.prefix)
     stop_containers(client, opts.max_run_time, matcher, opts.dry_run)
diff --git a/docker_custodian/docker_gc.py b/docker_custodian/docker_gc.py
index 40dae8d..6c7f685 100644
--- a/docker_custodian/docker_gc.py
+++ b/docker_custodian/docker_gc.py
@@ -220,7 +220,7 @@ def main():
         stream=sys.stdout)
 
     args = get_args()
-    client = docker.Client(version='auto', timeout=args.timeout)
+    client = docker.APIClient(version='auto', timeout=args.timeout)
 
     if args.max_container_age:
         cleanup_containers(client, args.max_container_age, args.dry_run)
diff --git a/setup.py b/setup.py
index 556e8aa..7873542 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@ setup(
     include_package_data=True,
     install_requires=[
         'python-dateutil',
-        'docker-py >= 0.5',
+        'docker',
         'pytimeparse',
     ],
     license="Apache License 2.0",
diff --git a/tests/conftest.py b/tests/conftest.py
index 2fbc83c..b891cc2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -48,6 +48,6 @@ def later_time():
 
 @pytest.fixture
 def mock_client():
-    client = mock.create_autospec(docker.Client)
-    client._version = '1.17'
+    client = mock.create_autospec(docker.APIClient)
+    client._version = '1.21'
     return client
diff --git a/tests/docker_gc_test.py b/tests/docker_gc_test.py
index b980181..54cbe6f 100644
--- a/tests/docker_gc_test.py
+++ b/tests/docker_gc_test.py
@@ -466,7 +466,7 @@ def test_build_exclude_set_empty():
 
 def test_main(mock_client):
     with mock.patch(
-            'docker_custodian.docker_gc.docker.Client',
+            'docker_custodian.docker_gc.docker.APIClient',
             return_value=mock_client):
 
         with mock.patch(