Merge pull request #5530 from pradyunsg/misc/simplify-linter-use

Simplify linter use and make configuration consistent

docs/conf.py

@@ -11,10 +11,10 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
+import glob
 import os
 import re
 import sys
-import glob
 
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 

setup.cfg

@@ -1,7 +1,9 @@
 [isort]
 skip =
-    _vendor
-    __main__.py
+    .tox,
+    .scratch,
+    _vendor,
+    data
 multi_line_output = 5
 known_third_party =
     pip._vendor
@@ -12,7 +14,11 @@ default_section = THIRDPARTY
 include_trailing_comma = true
 
 [flake8]
-exclude = .tox,.idea,.scratch,*.egg,build,_vendor,data
+exclude =
+    .tox,
+    .scratch,
+    _vendor,
+    data
 select = E,W,F
 
 [mypy]

setup.py

@@ -3,7 +3,7 @@
 import re
 import sys
 
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 
 here = os.path.abspath(os.path.dirname(__file__))

src/pip/__main__.py

@@ -13,7 +13,7 @@
     path = os.path.dirname(os.path.dirname(__file__))
     sys.path.insert(0, path)
 
-from pip._internal import main as _main  # noqa
+from pip._internal import main as _main  # isort:skip # noqa
 
 if __name__ == '__main__':
     sys.exit(_main())

tox.ini

@@ -36,8 +36,8 @@ commands =
 [lint]
 deps = -r{toxinidir}/tools/lint-requirements.txt
 commands =
-    flake8 .
-    isort --recursive --check-only --diff src/pip tests
+    flake8
+    isort --check-only --diff
 
 [testenv:lint-py2]
 basepython = python2