aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-01-07 12:26:33 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-01-07 12:26:33 -0800
commitd7e04ae2f45c99034d564fd6a7747bf216d00ea9 (patch)
tree3aa52344b3c0a9c4f7457a281acba849a31655dc /tox.ini
parentffa8b4d5fedad8f9c1fdbd05a2da8fb2679168af (diff)
parent168c29d6d74060b0d9f592b740f8913cc5d07c5e (diff)
downloadcryptography-d7e04ae2f45c99034d564fd6a7747bf216d00ea9.tar.gz
cryptography-d7e04ae2f45c99034d564fd6a7747bf216d00ea9.tar.bz2
cryptography-d7e04ae2f45c99034d564fd6a7747bf216d00ea9.zip
Merge branch 'master' into setup-install-extension
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini3
1 files changed, 2 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 93f5b421..ce2f5398 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,10 @@ envlist = py26,py27,pypy,py32,py33,docs,pep8,py3pep8
[testenv]
deps =
- pytest
coverage
+ iso8601
pretend
+ pytest
commands =
coverage run --source=cryptography/,tests/ -m pytest --capture=no --strict
coverage report -m