diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-12 07:26:16 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-08-12 07:26:16 -0400 |
| commit | 0b4df977c1427034760c5237a337f245d021d142 (patch) | |
| tree | 946ad5abc457f3e0a42751add10af508421f922e | |
| parent | 446a457218e3f793f4fec6b73e719c37bfef7d6e (diff) | |
| parent | d1c0188e73debcf73bacca2e338cf5ab9e2c9c04 (diff) | |
| download | cryptography-0b4df977c1427034760c5237a337f245d021d142.tar.gz cryptography-0b4df977c1427034760c5237a337f245d021d142.tar.bz2 cryptography-0b4df977c1427034760c5237a337f245d021d142.zip | |
Merge branch 'master' into simple-symmetric-encryption
| -rw-r--r-- | cryptography/__about__.py | 5 | ||||
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | tox.ini | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cryptography/__about__.py b/cryptography/__about__.py index 16d631fd..bb9a6921 100644 --- a/cryptography/__about__.py +++ b/cryptography/__about__.py @@ -24,8 +24,9 @@ __uri__ = "https://github.com/alex/cryptography" __version__ = "0.1.dev1" -__author__ = ("Alex Gaynor, Donald Stufft, Laurens van Houvten, " - "Jean-Paul Calderone, Chris Heime, and Indivdual Contributors") +__author__ = ("Alex Gaynor, Hynek Schlawack, Donald Stufft, " + "Laurens Van Houtven, Jean-Paul Calderone, Christian Heimes, " + "and individual contributors.") __email__ = "cryptography-dev@python.org" __license__ = "Apache License, Version 2.0" 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', ] @@ -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 |