Linting improvements

bork/__init__.py

@@ -1,6 +1,7 @@
 import os
 from pathlib import Path
 import sys
+
 import toml
 
 from . import builder

bork/builder.py

@@ -3,7 +3,7 @@
 import subprocess
 import sys
 # Slight kludge so we can have a function named zipapp().
-import zipapp as Zipapp
+import zipapp as Zipapp  # noqa: N812
 
 import pep517.build
 

bork/cli.py

@@ -7,7 +7,7 @@
 from . import download as _download
 from . import release as _release
 from . import run as _run
-from . import DOWNLOAD_SOURCES
+from . import DOWNLOAD_SOURCES  # noqa: I100
 
 
 DOWNLOAD_SOURCES_STR = ' '.join(DOWNLOAD_SOURCES)
@@ -28,23 +28,19 @@ def clean():
     _clean()
 
 
-# pylint: disable=redefined-outer-name
-# NOTE: It's okay to redefine `release` in download(), since it doesn't
-#       use release().
-
 @cli.command()
 @click.option('--files', default='*.pyz',
               help='Comma-separated list of filenames to download. Supports '
                    'wildcards (* = everything, ? = any single character).')
 @click.option('--directory', default='downloads',
               help='Directory to save files in. Created if missing.')
 @click.argument('package', nargs=1)
-@click.argument('release', nargs=1, default='latest')
-def download(files, directory, package, release):
+@click.argument('release_tag', nargs=1, default='latest')
+def download(files, directory, package, release_tag):
     # NOTE: We change the order of the arguments here, to move away from
     #       what makes sense on a CLI interface to what makes sense in a
     #       Python interface.
-    _download(package, release, files, directory)
+    _download(package, release_tag, files, directory)
 
 # pylint: enable=redefined-outer-name
 

bork/pypi.py

@@ -1,4 +1,5 @@
 from twine.cli import dispatch as twine_upload
+
 from .asset_manager import download_assets
 from .filesystem import find_files
 from .pypi_api import get_download_info

setup.cfg

@@ -35,9 +35,9 @@ linting =
     flake8==3.7.8
     flake8-bugbear==19.8.0
     flake8-commas==2.0.0
-    flake8-docstrings==1.4.0
-    # pydocstyle is pinned due to https://gitlab.com/pycqa/flake8-docstrings/issues/36
-    pydocstyle==4.0.1
+    flake8-docstrings==1.5.0
+    flake8-import-order
+    pep8-naming
     pylint==2.4.1
 
 testing =
@@ -50,7 +50,7 @@ console_scripts =
     bork = bork.cli:main
 
 [flake8]
-select = C,E,F,W,B,B9
+select = C,E,F,I,N,W,B,B9
 max-line-length = 85
 exclude =
     .eggs,
@@ -60,3 +60,5 @@ exclude =
     build,
     dist,
     venv
+
+import-order-style = google