summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Quast <contact@jeffquast.com>2015-02-27 20:27:51 -0800
committerJeff Quast <contact@jeffquast.com>2015-02-27 20:27:51 -0800
commit1d2f55415e3bd3c1ef6422abfd0eca1e25cb03da (patch)
tree0607c810840de8c6949d4ff2edf52af689b67421
parent3d8ea2b1ce2bd66018d1d08bf7105089ba495bf6 (diff)
downloadblessings-1d2f55415e3bd3c1ef6422abfd0eca1e25cb03da.tar.gz
leave pep8 and flake8 up to prospector, not pytest
We disable the --pep8 and --flakes arguments for py.test, leaving static analysis up to 'prospector', with the intent to disable the "ignore exit code" currently used (which is indicated by prefixing the 'prospector' command with a hyphen).
-rw-r--r--tox.ini16
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}