From ec58856ee3145eef2b0d02e72d3ee4548b241b0e Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 11 May 2023 15:52:37 +0300
Subject: [PATCH] Clean up unnecessary noqa comments

Signed-off-by: Aarni Koskela <akx@iki.fi>
---
 docker/types/containers.py           | 7 +++++--
 docs/conf.py                         | 2 +-
 setup.py                             | 2 +-
 tests/integration/api_client_test.py | 2 +-
 tests/unit/fake_api.py               | 6 +++---
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/docker/types/containers.py b/docker/types/containers.py
index 6d54aa65..a2806138 100644
--- a/docker/types/containers.py
+++ b/docker/types/containers.py
@@ -48,8 +48,11 @@ class LogConfig(DictType):
         >>> container = client.create_container('busybox', 'true',
         ...    host_config=hc)
         >>> client.inspect_container(container)['HostConfig']['LogConfig']
-        {'Type': 'json-file', 'Config': {'labels': 'production_status,geo', 'max-size': '1g'}}
-    """  # noqa: E501
+        {
+            'Type': 'json-file',
+            'Config': {'labels': 'production_status,geo', 'max-size': '1g'}
+        }
+    """
     types = LogConfigTypesEnum
 
     def __init__(self, **kwargs):
diff --git a/docs/conf.py b/docs/conf.py
index e9971e0d..a529f8be 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,6 +18,7 @@
 import datetime
 import os
 import sys
+from importlib.metadata import version
 sys.path.insert(0, os.path.abspath('..'))
 
 
@@ -64,7 +65,6 @@ author = 'Docker Inc'
 # built documents.
 #
 # see https://github.com/pypa/setuptools_scm#usage-from-sphinx
-from importlib.metadata import version
 release = version('docker')
 # for example take major/minor
 version = '.'.join(release.split('.')[:2])
diff --git a/setup.py b/setup.py
index ff6da714..d0145d23 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,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',  # noqa: E501
+        'Changelog': 'https://docker-py.readthedocs.io/en/stable/change-log.html',
         'Source': 'https://github.com/docker/docker-py',
         'Tracker': 'https://github.com/docker/docker-py/issues',
     },
diff --git a/tests/integration/api_client_test.py b/tests/integration/api_client_test.py
index d7a22a04..ae71a57b 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:  # noqa: E722
+        except Exception:
             pass
         end = time.time()
         assert res is None
diff --git a/tests/unit/fake_api.py b/tests/unit/fake_api.py
index 133a99f8..87d89275 100644
--- a/tests/unit/fake_api.py
+++ b/tests/unit/fake_api.py
@@ -4,10 +4,10 @@ from . import fake_stat
 
 CURRENT_VERSION = f'v{constants.DEFAULT_DOCKER_API_VERSION}'
 
-FAKE_CONTAINER_ID = '81cf499cc928ce3fedc250a080d2b9b978df20e4517304c45211e8a68b33e254'  # noqa: E501
+FAKE_CONTAINER_ID = '81cf499cc928ce3fedc250a080d2b9b978df20e4517304c45211e8a68b33e254'
 FAKE_IMAGE_ID = 'sha256:fe7a8fc91d3f17835cbb3b86a1c60287500ab01a53bc79c4497d09f07a3f0688'  # noqa: E501
-FAKE_EXEC_ID = 'b098ec855f10434b5c7c973c78484208223a83f663ddaefb0f02a242840cb1c7'  # noqa: E501
-FAKE_NETWORK_ID = '1999cfb42e414483841a125ade3c276c3cb80cb3269b14e339354ac63a31b02c'  # noqa: E501
+FAKE_EXEC_ID = 'b098ec855f10434b5c7c973c78484208223a83f663ddaefb0f02a242840cb1c7'
+FAKE_NETWORK_ID = '1999cfb42e414483841a125ade3c276c3cb80cb3269b14e339354ac63a31b02c'
 FAKE_IMAGE_NAME = 'test_image'
 FAKE_TARBALL_PATH = '/path/to/tarball'
 FAKE_REPO_NAME = 'repo'