diff options
| author | Hynek Schlawack <hs@ox.cx> | 2013-08-12 01:29:37 -0700 |
|---|---|---|
| committer | Hynek Schlawack <hs@ox.cx> | 2013-08-12 01:29:37 -0700 |
| commit | 318b64947d4531279ea6ac1775b7bb00cbec1989 (patch) | |
| tree | 3c892ebe39052e693c7592641b2f16533d638ad9 | |
| parent | c399a73cc02af6c9085bdf498e75a4e89471764d (diff) | |
| parent | 235fa7199deeb6fab4412fe29a9520c9d5d8d361 (diff) | |
| download | cryptography-318b64947d4531279ea6ac1775b7bb00cbec1989.tar.gz cryptography-318b64947d4531279ea6ac1775b7bb00cbec1989.tar.bz2 cryptography-318b64947d4531279ea6ac1775b7bb00cbec1989.zip | |
Merge pull request #42 from dstufft/doctests
Use the Sphinx doctest builder
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | tox.ini | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py index bd8642c5..16b1109e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -25,6 +25,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ 'sphinx.ext.autodoc', + 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.viewcode', ] @@ -8,8 +8,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 |