Merge branch 'blessed-integration-leave-pep8-to-prospector' into blessed-integration-freebsd-support

1 files changed, 7 insertions, 9 deletions

diff --git a/tox.ini b/tox.ini
index ff8b2b6..ebdf04e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = static_analysis,
+envlist = sa,
           py26,
           py27,
           py33,
@@ -11,24 +11,22 @@ skip_missing_interpreters = true
 [testenv]
 whitelist_externals = /bin/bash /bin/mv
 setenv = PYTHONIOENCODING=UTF8
-deps = pytest-flakes
-       pytest-xdist
-       pytest-pep8
+deps = pytest-xdist
        pytest-cov
        pytest
        mock
 commands = {envbindir}/py.test \
-               --strict --pep8 --flakes \
-               --junit-xml=results.{envname}.xml --verbose \
+               --strict --junit-xml=results.{envname}.xml \
+               --verbose --verbose \
                --cov blessings blessings/tests --cov-report=term-missing \
                {posargs}
            /bin/mv {toxinidir}/.coverage {toxinidir}/.coverage.{envname}
 
-[testenv:static_analysis]
+[testenv:sa]
+# static analysis
 deps = prospector[with_everything]
-commands = prospector \
+commands = -prospector \
                --die-on-tool-error \
-               --test-warnings \
                --doc-warnings \
                {toxinidir}