Merge pull request #21 from Runscope/pep8-ini

Move pep8 configuration to setup.cfg
stevearc · Nov 7, 2014 · b36b5d0 · b36b5d0
1 parent 6b4a95f
commit b36b5d0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.pep8.ini b/.pep8.ini
diff --git a/run_autopep8.sh b/run_autopep8.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -e
-declare -r CONF=".pep8.ini"
+declare -r CONF="setup.cfg"
 declare -r ARGS=(ignore select max-line-length)
 declare -r HELP="usage: $0 [all]
 

diff --git a/setup.cfg b/setup.cfg
@@ -5,3 +5,7 @@ dynamo-port=8001
 
 [wheel]
 universal = 1
+
+[pep8]
+max-line-length=80
+ignore=E501,E24
diff --git a/tox.ini b/tox.ini
@@ -24,4 +24,4 @@ deps =
 commands =
     coverage run --source=flywheel --branch setup.py nosetests
     pylint --rcfile=.pylintrc flywheel tests
-    pep8 --config=.pep8.ini flywheel tests
+    pep8 flywheel tests