1 files changed, 24 insertions, 3 deletions
diff --git a/tox.ini b/tox.ini
index b190ade..8f255d2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,8 +20,29 @@ commands=
 
 [testenv:flakes]
 deps = pytest-flakes>=0.2
-commands = py.test --flakes -m flakes tox tests
+       pytest-pep8
+
+commands = py.test -x --flakes --pep8 tox tests
+
+[testenv:dev]
+# required to make looponfail reload on every source code change
+usedevelop = True
+
+deps =
+      pytest-xdist>=1.11
+commands = {posargs:py.test -s -x -f -v}
 
 [pytest]
-rsyncdirs=tests tox
-addopts = -rsxXf
+rsyncdirs = tests tox
+addopts = -rsxX
+# pytest-xdist plugin configuration
+looponfailroots = tox tests
+norecursedirs = .hg .tox
+
+# pytest-pep8 plugin configuration
+pep8maxlinelength = 99
+# W503 - line break before binary operator
+# E402 - module level import not at top of file
+# E731 - do not assign a lambda expression, use a def
+pep8ignore =
+           *.py W503 E402 E731