aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-08-08 22:05:20 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2013-08-08 22:05:20 -0700
commit3c6da26a73d02f74e731badbd878fbbfb62c4289 (patch)
treeb6f432a202b169d81d26a89e980357b655a1b8a5 /tox.ini
parent95b8620e738b36a1e6e4bd015149bcb0851b3da9 (diff)
parent80bb237b06ce5cf5180e4a44874685e3571e813c (diff)
downloadcryptography-3c6da26a73d02f74e731badbd878fbbfb62c4289.tar.gz
cryptography-3c6da26a73d02f74e731badbd878fbbfb62c4289.tar.bz2
cryptography-3c6da26a73d02f74e731badbd878fbbfb62c4289.zip
Merge branch 'master' into simple-symmetric-encryption
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini5
1 files changed, 3 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 5d214bd6..81c66758 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,7 @@ envlist = py26,py27,pypy,py32,py33,docs,pep8
[testenv]
deps = pytest-cov
-commands = py.test --cov=cryptography/
+commands = py.test --cov=cryptography/ --cov=tests/
[testenv:docs]
deps = sphinx
@@ -13,4 +13,5 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html
[testenv:pep8]
deps = flake8
-commands = flake8 cryptography/ tests/ docs/
+# E128 continuation line under-indented for visual indent
+commands = flake8 --ignore="E128" cryptography/ tests/ docs/