Fix doc build

pbr 2.1.0 has a regression that it always tries to build 'man'
and this causes 'WARNING: "table cell spanning" not supported'.
We specify warning-is-error = 1 and as a result all documentation build
now fails.

This can be fixed by excluding pbr 2.1.0 in requirements.txt.
Note that pbr 2.1.0 is already marked as blacklist in global-requirements.txt.

'man_pages' config option is also dropped from doc/source/conf.py
as we are not interested in manpages as output at all.

Related-Bug: #1681983

Change-Id: Id9aa7b128ad8d4af5db6b96a758f1134a774db1b
This commit is contained in:
Boden R 2017-04-14 04:41:23 -06:00 committed by Akihiro Motoki
parent 095580ec46
commit 22b8477ac8
2 changed files with 1 additions and 4 deletions

View File

@ -101,9 +101,6 @@ pygments_style = 'sphinx'
# A list of ignored prefixes for module index sorting.
modindex_common_prefix = ['neutron-specs.']
# -- Options for man page output ----------------------------------------------
man_pages = []
# -- Options for HTML output ---------------------------------------------------
# The theme to use for HTML and HTML Help pages. See the documentation for

View File

@ -2,7 +2,7 @@ actdiag
blockdiag
nwdiag
oslosphinx>=4.7.0 # Apache-2.0
pbr>=2.0.0 # Apache-2.0
pbr>=2.0.0,!=2.1.0 # Apache-2.0
seqdiag
sphinx>=1.5.1 # BSD
sphinxcontrib-actdiag