Merge pull request #481 from kyleam/docker-py-update

reproman/distributions/tests/test_docker.py

@@ -22,7 +22,7 @@
 @mark.skipif_no_network
 @mark.skipif_no_docker_engine
 def test_docker_trace_tag():
-    client = docker.Client()
+    client = docker.APIClient()
     client.pull('alpine:3.6')
 
     tracer = DockerTracer()
@@ -40,7 +40,7 @@ def test_docker_trace_tag():
 @mark.skipif_no_network
 @mark.skipif_no_docker_engine
 def test_docker_trace_id():
-    client = docker.Client()
+    client = docker.APIClient()
     repo_id = 'sha256:f625bd3ff910ad2c68a405ccc5e294d2714fc8cfe7b5d80a8331c72ad5cc7630'
     name = 'alpine@' + repo_id
     client.pull(name)
@@ -62,7 +62,7 @@ def test_docker_trace_id():
 @mark.skipif_no_network
 @mark.skipif_no_docker_engine
 def test_docker_trace_local_image():
-    client = docker.Client()
+    client = docker.APIClient()
     client.pull('alpine:3.6')
     tracer = DockerTracer()
     # Test tracing a local image not saved in a repository
@@ -85,7 +85,7 @@ def test_docker_trace_local_image():
 @mark.skipif_no_docker_engine
 def test_docker_distribution():
 
-    client = docker.Client()
+    client = docker.APIClient()
     session = get_local_session()
 
     # Verify alpine:3.5 image is not stored locally

reproman/interface/tests/test_create.py

@@ -26,7 +26,7 @@ def test_create_interface():
     Test creating an environment
     """
 
-    with patch('docker.Client') as client, \
+    with patch('docker.APIClient') as client, \
         patch('reproman.resource.ResourceManager.save_inventory'), \
         patch('reproman.resource.ResourceManager._get_inventory'), \
         swallow_logs(new_level=logging.DEBUG) as log:

reproman/interface/tests/test_delete.py

@@ -62,7 +62,7 @@ def test_delete_interface():
     Test deleting a resource.
     """
 
-    with patch('docker.Client', new_callable=mock_docker_client) as client, \
+    with patch('docker.APIClient', new_callable=mock_docker_client) as client, \
             patch('reproman.interface.delete.get_manager',
                 new=mock_get_manager), \
             swallow_logs(new_level=logging.DEBUG) as log:

reproman/interface/tests/test_install.py

@@ -20,7 +20,7 @@
 @mark.skipif_no_docker_dependencies
 def test_install_interface(demo1_spec):
 
-    with patch('docker.Client') as client, \
+    with patch('docker.APIClient') as client, \
         patch('reproman.distributions.debian.DebianDistribution.install_packages'), \
         patch('reproman.resource.ResourceManager._get_inventory') as get_inventory, \
         patch('requests.get') as requests, \

reproman/interface/tests/test_login.py

@@ -23,7 +23,7 @@ def test_login_interface():
     Test logging into an environment
     """
 
-    with patch('docker.Client') as client, \
+    with patch('docker.APIClient') as client, \
         patch('reproman.resource.ResourceManager._get_inventory') as get_inventory, \
         patch('dockerpty.start'), \
         swallow_logs(new_level=logging.DEBUG) as log:

reproman/interface/tests/test_ls.py

@@ -57,7 +57,7 @@ def ls_fn(resource_manager):
     def fn(*args, **kwargs):
         skipif.no_docker_dependencies()
         with contextlib.ExitStack() as stack:
-            stack.enter_context(patch("docker.Client"))
+            stack.enter_context(patch("docker.APIClient"))
             stack.enter_context(patch("reproman.interface.ls.get_manager",
                                       return_value=resource_manager))
             return ls(*args, **kwargs)

reproman/resource/docker_container.py

@@ -71,7 +71,7 @@ def is_engine_running(base_url=None):
         """
         from requests.exceptions import ConnectionError
         try:
-            session = docker.Client(base_url=base_url)
+            session = docker.APIClient(base_url=base_url)
             session.info()
         except docker.errors.InvalidConfigFile as exc:
             lgr.error(
@@ -108,7 +108,7 @@ def connect(self):
         Open a connection to the environment.
         """
         # Open a client connection to the Docker engine.
-        self._client = docker.Client(base_url=self.engine_url)
+        self._client = docker.APIClient(base_url=self.engine_url)
 
         containers = []
         for container in self._client.containers(all=True):
@@ -280,7 +280,10 @@ def get(self, src_path, dest_path=None, uid=-1, gid=-1):
         dest_path = self._prepare_dest_path(src_path, dest_path)
         dest_dir = os.path.dirname(dest_path)
         stream, stat = self.client.get_archive(self.container, src_path)
-        tarball = tarfile.open(fileobj=io.BytesIO(stream.read()))
+        # get_archive() returns a generator with the content (in 2 MB chunks by
+        # default). Consider exposing those chunks as a stream rather than
+        # joining them.
+        tarball = tarfile.open(fileobj=io.BytesIO(b"".join(stream)))
         tarball.extractall(path=dest_dir)
         os.rename(os.path.join(dest_dir, src_basename), dest_path)
 

reproman/resource/tests/test_docker_container.py

@@ -31,7 +31,7 @@
 @mark.skipif_no_docker_dependencies
 def test_dockercontainer_class(resman):
 
-    with patch('docker.Client') as client, \
+    with patch('docker.APIClient') as client, \
         patch('dockerpty.start') as dockerpty, \
             swallow_logs(new_level=logging.DEBUG) as log:
 

reproman/resource/tests/test_session.py

@@ -418,7 +418,7 @@ def test_session_container(location, testing_container, check_methods):
     """
     cls = import_resource(*location)
     import docker
-    client = docker.Client()
+    client = docker.APIClient()
     container = next(c for c in client.containers()
                      if '/testing-container' in c['Names'])
     assert container

setup.py

@@ -69,7 +69,7 @@ def findsome(subdir, extensions):
         'chardet',  # python-debian misses dependency on it
     ],
     'docker': [
-        'docker-py>=0.3.2',
+        'docker>=3.0.0',
         'dockerpty',
     ],
     'aws': [