Merge pull request #328 from gyermolenko/upgrade_docker_package

Upgraded docker-py package to v2

Author: jettify

requirements-dev.txt

@@ -5,8 +5,8 @@ aiohttp==2.3.6
 aiomysql==0.0.9
 aiopg==0.13.1
 coverage==4.4.2
+docker==2.6.1
 docker-compose==1.17.1
-docker-py==1.10.6
 flake8==3.5.0
 ipdb==0.10.3
 motor==1.1

tests/docker_fixtures.py

@@ -7,8 +7,8 @@
 import pymysql
 import pytest
 
-from docker import Client as DockerClient
-
+from docker import APIClient
+from docker import from_env
 
 TEMP_FOLDER = Path('/tmp') / 'aiohttp_admin'
 
@@ -37,9 +37,9 @@ def host():
 @pytest.fixture(scope='session')
 def docker():
     if os.environ.get('DOCKER_MACHINE_IP') is not None:
-        docker = DockerClient.from_env(assert_hostname=False)
+        docker = from_env(assert_hostname=False)
     else:
-        docker = DockerClient(version='auto')
+        docker = APIClient(version='auto')
     return docker