Remove the sphinxcontrib.programout [docs]dependency (#3830)

- By making a static text file at release time, and including that
   instead.

acme/docs/conf.py

@@ -39,7 +39,6 @@ extensions = [
     'sphinx.ext.todo',
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
-    'sphinxcontrib.programoutput',
 ]
 
 autodoc_member_order = 'bysource'

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

acme/docs/man/jws.rst

@@ -1 +1 @@
-.. program-output:: jws --help all
+.. literalinclude:: ../jws-help.txt

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',
 ]
 
 

docs/api/log.rst

@@ -1,5 +0,0 @@
-:mod:`certbot.log`
-----------------------
-
-.. automodule:: certbot.log
-   :members:

docs/conf.py

@@ -45,7 +45,6 @@ extensions = [
     'sphinx.ext.coverage',
     'sphinx.ext.viewcode',
     'repoze.sphinx.autointerface',
-    'sphinxcontrib.programoutput',
 ]
 
 autodoc_member_order = 'bysource'

setup.py

@@ -79,7 +79,6 @@ docs_extras = [
     'repoze.sphinx.autointerface',
     'Sphinx>=1.0',  # autodoc_member_order = 'bysource', autodoc_default_flags
     'sphinx_rtd_theme',
-    'sphinxcontrib-programoutput',
 ]
 
 setup(

tools/release.sh

@@ -147,6 +147,7 @@ cd ~-
 
 # get a snapshot of the CLI help for the docs
 certbot --help all > docs/cli-help.txt
+jws --help > acme/docs/jws-help.txt
 
 cd ..
 # freeze before installing anything else, so that we know end-user KGS