summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-08-10 07:35:26 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-08-10 07:35:26 -0400
commit1bdc86a1bd524672cf5a55ec8c966b88ccc1b68d (patch)
treee6ea93e025c5814ed8dc219970844e3b6d3d6250
parentd023208415eb330daf2a09ade85a0240c2a9453f (diff)
downloadpython-coveragepy-git-1bdc86a1bd524672cf5a55ec8c966b88ccc1b68d.tar.gz
Fix the pep8 settings.
-rw-r--r--Makefile2
-rw-r--r--tox.ini4
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 67fd6f00..233be419 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ spell:
-pylint --disable=all --enable=spelling $(LINTABLE)
pep8:
- pep8 --filename=*.py --ignore=E401,E301 --repeat $(LINTABLE)
+ pep8 --filename=*.py --repeat $(LINTABLE)
test:
tox -e py27 $(ARGS)
diff --git a/tox.ini b/tox.ini
index 7e55bc42..355ca7de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,6 +49,8 @@ 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
+ignore = E265,E123,E133,E226,E241,E242,E301,E401
max-line-length = 100