aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-08-12 07:26:16 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2013-08-12 07:26:16 -0400
commit0b4df977c1427034760c5237a337f245d021d142 (patch)
tree946ad5abc457f3e0a42751add10af508421f922e /tox.ini
parent446a457218e3f793f4fec6b73e719c37bfef7d6e (diff)
parentd1c0188e73debcf73bacca2e338cf5ab9e2c9c04 (diff)
downloadcryptography-0b4df977c1427034760c5237a337f245d021d142.tar.gz
cryptography-0b4df977c1427034760c5237a337f245d021d142.tar.bz2
cryptography-0b4df977c1427034760c5237a337f245d021d142.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 1b6a45b8..4d17ebe8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,9 @@ commands = py.test --cov=cryptography/ --cov=tests/
[testenv:docs]
deps = sphinx
basepython = python2.7
-changedir = docs
-commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . _build/html
+commands =
+ sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
+ sphinx-build -W -b doctest -d {envtmpdir}/doctrees docs docs/_build/html
[testenv:pep8]
deps = flake8