Move pycodestyle settings to setup.cfg

4 files changed, 10 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 3f220236..13689316 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ spell:
 	-pylint --disable=all --enable=spelling $(LINTABLE)
 
 pep8:
-	pep8 --filename=*.py --repeat $(LINTABLE)
+	pycodestyle --filename=*.py --repeat $(LINTABLE)
 
 test:
 	tox -e py27,py35 $(ARGS)
diff --git a/setup.cfg b/setup.cfg
index ee30a34b..5e19bd2b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,11 @@
 [tool:pytest]
 addopts = -q
+
+[pep8]
+# E265 block comment should start with '# '
+# E266 too many leading '#' for block comment
+# E301 expected 1 blank line, found 0
+# E401 multiple imports on one line
+# The rest are the default ignored warnings.
+ignore = E265,E266,E123,E133,E226,E241,E242,E301,E401
+max-line-length = 100
diff --git a/tox-new.ini b/tox-new.ini
index aaca6a4d..bc5f041a 100644
--- a/tox-new.ini
+++ b/tox-new.ini
@@ -51,13 +51,3 @@ basepython = pypy2.6
 
 [testenv:pypy3_24]
 basepython = pypy3-2.4
-
-
-# Yes, pep8 will read its settings from tox.ini!
-[pep8]
-# E265: block comment should start with '# '
-# E301 expected 1 blank line, found 0
-# E401 multiple imports on one line
-# The rest are the default ignored warnings.
-ignore = E265,E123,E133,E226,E241,E242,E301,E401
-max-line-length = 100
diff --git a/tox.ini b/tox.ini
index 669f6b32..a55f8458 100644
--- a/tox.ini
+++ b/tox.ini
@@ -80,13 +80,3 @@ commands =
     sphinx-build -b html -b linkcheck -aEnQW doc doc/_build/html
     rst2html.py --strict CHANGES.rst doc/_build/trash
     rst2html.py --strict README.rst doc/_build/trash
-
-# Yes, pep8 will read its settings from tox.ini!
-[pep8]
-# E265 block comment should start with '# '
-# E266 too many leading '#' for block comment
-# E301 expected 1 blank line, found 0
-# E401 multiple imports on one line
-# The rest are the default ignored warnings.
-ignore = E265,E266,E123,E133,E226,E241,E242,E301,E401
-max-line-length = 100