From 72f4f527ad60b2a677b883dc54669ebe98f0879f Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Wed, 9 Jan 2019 11:14:08 -0800
Subject: Update test dependencies to latest version, fix some flake8 errors

Signed-off-by: Joffrey F <joffrey@docker.com>
---
 docker/auth.py                       |  2 +-
 docker/types/containers.py           | 11 +++++------
 setup.py                             |  2 +-
 test-requirements.txt                | 10 ++++++----
 tests/integration/api_client_test.py |  2 +-
 tests/unit/dockertypes_test.py       |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docker/auth.py b/docker/auth.py
index 58b35eb..638ab9b 100644
--- a/docker/auth.py
+++ b/docker/auth.py
@@ -273,7 +273,7 @@ class AuthConfig(dict):
                     'Password': data['Secret'],
                 })
             return res
-        except dockerpycreds.CredentialsNotFound as e:
+        except dockerpycreds.CredentialsNotFound:
             log.debug('No entry found')
             return None
         except dockerpycreds.StoreError as e:
diff --git a/docker/types/containers.py b/docker/types/containers.py
index d040c0f..fd8cab4 100644
--- a/docker/types/containers.py
+++ b/docker/types/containers.py
@@ -51,8 +51,7 @@ class LogConfig(DictType):
         ...    host_config=hc)
         >>> client.inspect_container(container)['HostConfig']['LogConfig']
         {'Type': 'json-file', 'Config': {'labels': 'production_status,geo', 'max-size': '1g'}}
-
-    """ # flake8: noqa
+    """  # noqa: E501
     types = LogConfigTypesEnum
 
     def __init__(self, **kwargs):
@@ -320,10 +319,10 @@ class HostConfig(dict):
             if not isinstance(ulimits, list):
                 raise host_config_type_error('ulimits', ulimits, 'list')
             self['Ulimits'] = []
-            for l in ulimits:
-                if not isinstance(l, Ulimit):
-                    l = Ulimit(**l)
-                self['Ulimits'].append(l)
+            for lmt in ulimits:
+                if not isinstance(lmt, Ulimit):
+                    lmt = Ulimit(**lmt)
+                self['Ulimits'].append(lmt)
 
         if log_config is not None:
             if not isinstance(log_config, LogConfig):
diff --git a/setup.py b/setup.py
index f1c3c20..94fbdf4 100644
--- a/setup.py
+++ b/setup.py
@@ -67,7 +67,7 @@ setup(
     url='https://github.com/docker/docker-py',
     project_urls={
         'Documentation': 'https://docker-py.readthedocs.io',
-        'Changelog': 'https://docker-py.readthedocs.io/en/stable/change-log.html',  # flake8: noqa
+        'Changelog': 'https://docker-py.readthedocs.io/en/stable/change-log.html',  # noqa: E501
         'Source': 'https://github.com/docker/docker-py',
         'Tracker': 'https://github.com/docker/docker-py/issues',
     },
diff --git a/test-requirements.txt b/test-requirements.txt
index 07e1a90..510fa29 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,9 @@
-coverage==3.7.1
-flake8==3.4.1
+coverage==4.5.2
+flake8==3.6.0; python_version != '3.3'
+flake8==3.4.1; python_version == '3.3'
 mock==1.0.1
 pytest==2.9.1; python_version == '3.3'
-pytest==3.6.3; python_version > '3.3'
-pytest-cov==2.1.0
+pytest==4.1.0; python_version != '3.3'
+pytest-cov==2.6.1; python_version != '3.3'
+pytest-cov==2.5.1; python_version == '3.3'
 pytest-timeout==1.3.3
diff --git a/tests/integration/api_client_test.py b/tests/integration/api_client_test.py
index 905e064..9e348f3 100644
--- a/tests/integration/api_client_test.py
+++ b/tests/integration/api_client_test.py
@@ -47,7 +47,7 @@ class ConnectionTimeoutTest(unittest.TestCase):
         # This call isn't supposed to complete, and it should fail fast.
         try:
             res = self.client.inspect_container('id')
-        except:
+        except:  # noqa: E722
             pass
         end = time.time()
         assert res is None
diff --git a/tests/unit/dockertypes_test.py b/tests/unit/dockertypes_test.py
index cdacf8c..0689d07 100644
--- a/tests/unit/dockertypes_test.py
+++ b/tests/unit/dockertypes_test.py
@@ -14,7 +14,7 @@ from docker.types.services import convert_service_ports
 
 try:
     from unittest import mock
-except:
+except:  # noqa: E722
     import mock
 
 
-- 
cgit v1.2.1