diff options
| author | Peter Eckersley <pde@users.noreply.github.com> | 2016-11-30 21:47:10 +0300 |
|---|---|---|
| committer | Brad Warren <bmw@users.noreply.github.com> | 2016-11-30 21:47:10 +0300 |
| commit | 0956e61c7c8653218bcaa46087d4508fc795feaa (patch) | |
| tree | 520af0dfc90dc5feaa6389f885a1389ad1fb4dbb /acme | |
| parent | 83966cdfcf97032ab026e4d99aa55f1fb5df44d2 (diff) | |
Remove the sphinxcontrib.programout [docs]dependency (#3830)
- By making a static text file at release time, and including that
instead.
Diffstat (limited to 'acme')
| -rw-r--r-- | acme/docs/conf.py | 1 | ||||
| -rw-r--r-- | acme/docs/jws-help.txt | 8 | ||||
| -rw-r--r-- | acme/docs/man/jws.rst | 2 | ||||
| -rw-r--r-- | acme/setup.py | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/acme/docs/conf.py b/acme/docs/conf.py index 55f5eee3f..dea23a8ca 100644 --- a/acme/docs/conf.py +++ b/acme/docs/conf.py @@ -39,7 +39,6 @@ extensions = [ 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode', - 'sphinxcontrib.programoutput', ] autodoc_member_order = 'bysource' diff --git a/acme/docs/jws-help.txt b/acme/docs/jws-help.txt new file mode 100644 index 000000000..34cf5ce23 --- /dev/null +++ b/acme/docs/jws-help.txt @@ -0,0 +1,8 @@ +usage: jws [-h] [--compact] {sign,verify} ... + +positional arguments: + {sign,verify} + +optional arguments: + -h, --help show this help message and exit + --compact diff --git a/acme/docs/man/jws.rst b/acme/docs/man/jws.rst index fb3121a96..d7ff8f405 100644 --- a/acme/docs/man/jws.rst +++ b/acme/docs/man/jws.rst @@ -1 +1 @@ -.. program-output:: jws --help all +.. literalinclude:: ../jws-help.txt diff --git a/acme/setup.py b/acme/setup.py index 2b32f7e28..895889c7c 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -49,7 +49,6 @@ dev_extras = [ docs_extras = [ 'Sphinx>=1.0', # autodoc_member_order = 'bysource', autodoc_default_flags 'sphinx_rtd_theme', - 'sphinxcontrib-programoutput', ] |