Merge branch 'master' into pyup-scheduled-update-2018-03-05

Author: jettify

requirements-dev.txt

@@ -16,5 +16,5 @@ pytest==3.4.1
 python-dateutil==2.6.1
 sqlalchemy==1.2.4
 trafaret==1.1.1
-pymysql==0.8.0
+pymysql==0.7.11
 -r requirements-doc.txt

tests/docker_fixtures.py

@@ -6,7 +6,7 @@
 import pymysql
 import pytest
 
-from docker import APIClient
+from docker import Client
 
 
 TEMP_FOLDER = Path('/tmp') / 'aiohttp_admin'
@@ -30,7 +30,7 @@ def session_id():
 
 @pytest.fixture(scope='session')
 def docker():
-    docker = APIClient(version='auto')
+    docker = Client(version='auto')
     return docker