summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-01-02 10:55:36 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-01-02 10:55:36 -0800
commit5bae063ff2601db15d84920f18bae194bcd3d373 (patch)
treeb6c39a3f84b434ae26245fcda6abe6c1e4165156 /tox.ini
parent09aa74635f54ace5480a6d502b0da92651f516b6 (diff)
parenta6d5d6ec53da5bea0193047c5e535a05442f2dfd (diff)
downloadcryptography-5bae063ff2601db15d84920f18bae194bcd3d373.tar.gz
Merge branch 'master' into fernet
Conflicts: docs/index.rst
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 1174a6f86..ce2f5398b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ commands =
# Temporarily disable coverage on pypy because of performance problems with
# coverage.py on pypy.
[testenv:pypy]
-commands = py.test --capture=no
+commands = py.test --capture=no --strict
[testenv:pep8]
deps = flake8