Use pycodestyle instead of pep8

badwolf/lint/linters/pep8.py → badwolf/lint/linters/pycodestyle.py

@@ -10,14 +10,14 @@
 logger = logging.getLogger(__name__)
 
 
-class PEP8Linter(PythonLinter):
-    name = 'pep8'
+class PyCodeStyleLinter(PythonLinter):
+    name = 'pycodestyle'
 
     def is_usable(self):
-        return in_path('pep8')
+        return in_path('pycodestyle')
 
     def lint_files(self, files):
-        command = [self.python_name, '-m', 'pep8']
+        command = [self.python_name, '-m', 'pycodestyle']
         command += files
         _, output = run_command(command, split=True, cwd=self.working_dir)
         if not output:
@@ -28,7 +28,7 @@ def lint_files(self, files):
             yield Problem(filename, line, message, self.name)
 
     def _parse_line(self, line):
-        """pep8 only generates results as stdout.
+        """pycodestyle only generates results as stdout.
         Parse the output for real data."""
         parts = line.split(':', 3)
         message = parts[3].strip()

badwolf/lint/processor.py

@@ -10,7 +10,7 @@
 from badwolf.lint import Problems
 from badwolf.lint.linters.eslint import ESLinter
 from badwolf.lint.linters.flake8 import Flake8Linter
-from badwolf.lint.linters.pep8 import PEP8Linter
+from badwolf.lint.linters.pycodestyle import PyCodeStyleLinter
 from badwolf.lint.linters.csslint import CSSLinter
 from badwolf.lint.linters.shellcheck import ShellCheckLinter
 from badwolf.lint.linters.jsonlint import JSONLinter
@@ -29,7 +29,8 @@ class LintProcessor(object):
     LINTERS = {
         'eslint': ESLinter,
         'flake8': Flake8Linter,
-        'pep8': PEP8Linter,
+        'pep8': PyCodeStyleLinter,
+        'pycodestyle': PyCodeStyleLinter,
         'csslint': CSSLinter,
         'shellcheck': ShellCheckLinter,
         'jsonlint': JSONLinter,

docs/lint.rst

@@ -41,8 +41,8 @@
 名称                编程语言            官网/文档地址
 =================== =================== =======================================================
 flake8              Python              http://flake8.readthedocs.org/en/latest/
-pep8                Python              http://pep8.readthedocs.org/en/latest/
-pylint              Python              http://pep8.readthedocs.org/en/latest/
+pycodestyle         Python              http://pycodestyle.readthedocs.org/en/latest/
+pylint              Python              http://pylint.readthedocs.org/en/latest/
 bandit              Python              https://github.com/openstack/bandit
 eslint              JavaScript          http://eslint.org/
 csslint             CSS                 http://csslint.net/

requirements.txt

@@ -10,7 +10,7 @@ unidiff>=0.5.2
 optionaldict>=0.1.1
 flake8>=2.5.2
 pep8-naming>=0.3.3
-pep8>=1.7.0
+pycodestyle
 yamllint>=1.0.0
 bandit>=0.17.3
 restructuredtext-lint>=0.14.2

tests/test_lint.py

@@ -183,7 +183,7 @@ def test_eslint_lint_a_js(app, caplog):
     assert problem.line == 1
 
 
-def test_pep8_lint_a_py(app, caplog):
+def test_pycodestyle_lint_a_py(app, caplog):
     diff = """diff --git a/a.py b/a.py
 new file mode 100644
 index 0000000..fdeea15
@@ -208,8 +208,8 @@ def test_pep8_lint_a_py(app, caplog):
         pr_id=1
     )
     spec = Specification()
-    spec.linters.append(ObjectDict(name='pep8', pattern=None))
-    lint = LintProcessor(context, spec, os.path.join(FIXTURES_PATH, 'pep8'))
+    spec.linters.append(ObjectDict(name='pycodestyle', pattern=None))
+    lint = LintProcessor(context, spec, os.path.join(FIXTURES_PATH, 'pycodestyle'))
     patch = PatchSet(diff.split('\n'))
     with mock.patch.object(lint, 'load_changes') as load_changes,\
             mock.patch.object(lint, 'update_build_status') as build_status,\