Fix lint errors and make sure flake8 actually runs on CI

Author: elprans

.ci/package-version.py

@@ -6,8 +6,8 @@
 
 
 def main():
-    version_file = os.path.join(os.path.dirname(os.path.dirname(__file__)),
-                            'asyncpg', '__init__.py')
+    version_file = os.path.join(
+        os.path.dirname(os.path.dirname(__file__)), 'asyncpg', '__init__.py')
 
     with open(version_file, 'r') as f:
         for line in f:
@@ -16,7 +16,8 @@ def main():
                 print(version.strip(" \n'\""))
                 return 0
 
-    print('could not find package version in asyncpg/__init__.py', file=sys.stderr)
+    print('could not find package version in asyncpg/__init__.py',
+          file=sys.stderr)
     return 1
 
 

.ci/requirements.txt

@@ -1,4 +1,5 @@
 cython>=0.24
+flake8>=3.4.1
 uvloop>=0.5.0
 tinys3
 twine

.flake8

@@ -1,3 +1,3 @@
 [flake8]
 ignore = E402,E731
-exclude = .git,__pycache__,build,dist,.eggs
+exclude = .git,__pycache__,build,dist,.eggs,.github

asyncpg/connection.py

@@ -1238,7 +1238,7 @@ async def _do_execute(self, query, executor, timeout, retry=True):
                     after = time.monotonic()
                     timeout -= after - before
 
-        except exceptions.InvalidCachedStatementError as e:
+        except exceptions.InvalidCachedStatementError:
             # PostgreSQL will raise an exception when it detects
             # that the result type of the query has changed from
             # when the statement was prepared.  This may happen,

docs/conf.py

@@ -16,7 +16,8 @@
             version = version.strip(" \n'\"")
             break
     else:
-        raise RuntimeError('unable to read the version from asyncpg/__init__.py')
+        raise RuntimeError(
+            'unable to read the version from asyncpg/__init__.py')
 
 # -- General configuration ------------------------------------------------
 

setup.py

@@ -180,14 +180,16 @@ def _patch_cfile(self, cfile):
     readme = f.read()
 
 
-with open(os.path.join(os.path.dirname(__file__), 'asyncpg', '__init__.py')) as f:
+with open(os.path.join(
+        os.path.dirname(__file__), 'asyncpg', '__init__.py')) as f:
     for line in f:
         if line.startswith('__version__ ='):
             _, _, version = line.partition('=')
             VERSION = version.strip(" \n'\"")
             break
     else:
-        raise RuntimeError('unable to read the version from asyncpg/__init__.py')
+        raise RuntimeError(
+            'unable to read the version from asyncpg/__init__.py')
 
 
 setuptools.setup(

tests/test__sourcecode.py

@@ -27,15 +27,14 @@ def test_flake8(self):
         except ImportError:
             raise unittest.SkipTest('flake8 module is missing')
 
-        for subdir in ['asyncpg', 'tests']:
-            try:
-                subprocess.run(
-                    [sys.executable, '-m', 'flake8', '--config', config_path],
-                    check=True,
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE,
-                    cwd=os.path.join(root_path, subdir))
-            except subprocess.CalledProcessError as ex:
-                output = ex.output.decode()
-                raise AssertionError(
-                    'flake8 validation failed:\n{}'.format(output)) from None
+        try:
+            subprocess.run(
+                [sys.executable, '-m', 'flake8', '--config', config_path],
+                check=True,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                cwd=root_path)
+        except subprocess.CalledProcessError as ex:
+            output = ex.output.decode()
+            raise AssertionError(
+                'flake8 validation failed:\n{}'.format(output)) from None

tools/generate_type_map.py

@@ -28,10 +28,12 @@ async def runner(args):
     conn = await asyncpg.connect(host=args.pghost, port=args.pgport,
                                  user=args.pguser)
 
-    buf = '# GENERATED FROM pg_catalog.pg_type\n' + \
-          '# DO NOT MODIFY, use tools/generate_type_map.py to update\n\n' + \
-          'DEF INVALIDOID = {}\nDEF MAXBUILTINOID = {}\n'.format(
-                _INVALIDOID, _MAXBUILTINOID)
+    buf = (
+        '# GENERATED FROM pg_catalog.pg_type\n' +
+        '# DO NOT MODIFY, use tools/generate_type_map.py to update\n\n' +
+        'DEF INVALIDOID = {}\n'.format(_INVALIDOID) +
+        'DEF MAXBUILTINOID = {}\n'.format(_MAXBUILTINOID)
+    )
 
     pg_types = await conn.fetch('''
         SELECT