setup: Switch to pycodestyle and pylint imports

crobinso · crobinso · commit 82df2eca5db5 · 2018-03-04T16:41:13.000-05:00
Which seamlessly let's us run pylint/pycodestyle depending on
the invoking python version, 2 or 3
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,19 +39,19 @@ To test all supported python versions, run tox using any of the following.
     tox -- --rw-functional
 
 
-# pylint and pep8
+# pylint and pycodestyle
 
-To test for pylint or pep8 violations, you can run:
+To test for pylint or pycodestyle violations, you can run:
 
     python setup.py pylint
 
-Note: This expects that you already have pylint and pep8 installed.
+Note: This expects that you already have pylint and pycodestyle installed.
 
 
 # Patch Submission
 
 If you are submitting a patch, ensure the following:
-    [REQ] verify that no new pylint or pep8 violations
+    [REQ] verify that no new pylint or pycodestyle violations
     [REQ] run basic unit test suite across all python versions as described
         above.
 
diff --git a/setup.py b/setup.py
@@ -144,21 +144,32 @@ def finalize_options(self):
         pass
 
     def _run(self):
-        files = ["bugzilla/", "bin-bugzilla", "examples/*.py", "tests/*.py"]
+        import pylint.lint
+        import pycodestyle
+
+        files = (["bugzilla/", "bin-bugzilla"] +
+            glob.glob("examples/*.py") +
+            glob.glob("tests/*.py"))
         output_format = sys.stdout.isatty() and "colorized" or "text"
 
-        if os.path.exists("/usr/bin/pylint-2"):
-            cmd = "pylint-2 "
-        else:
-            cmd = "pylint "
-        cmd += "--output-format=%s " % output_format
-        cmd += " ".join(files)
-        os.system(cmd + " --rcfile tests/pylint.cfg")
-
-        print("running pep8")
-        cmd = "pep8 "
-        cmd += " ".join(files)
-        os.system(cmd + " --config tests/pep8.cfg --exclude oldclasses.py")
+        print("running pycodestyle")
+        style_guide = pycodestyle.StyleGuide(
+            config_file='tests/pycodestyle.cfg',
+            paths=files,
+        )
+        style_guide.options.exclude = pycodestyle.normalize_paths(
+            "bugzilla/oldclasses.py",
+        )
+        report = style_guide.check_files()
+        if style_guide.options.count:
+            sys.stderr.write(str(report.total_errors) + '\n')
+
+        print("running pylint")
+        pylint_opts = [
+            "--rcfile", "tests/pylint.cfg",
+            "--output-format=%s" % output_format,
+        ]
+        pylint.lint.Run(files + pylint_opts)
 
     def run(self):
         os.link("bin/bugzilla", "bin-bugzilla")
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,3 +1,4 @@
 # additional packages needed for testing
 coverage
-pep8
+pycodestyle
+pylint
diff --git a/tests/pycodestyle.cfg b/tests/pycodestyle.cfg
@@ -1,4 +1,4 @@
-[pep8]
+[pycodestyle]
 
 format = pylint
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[pep8]`
	`1`	`+[pycodestyle]`
`2`	`2`
`3`	`3`	`format = pylint`
`4`	`4`