openstack
/
devstack
Code Issues Proposed changes

update sphinx 

Update sphinx to the version used to build the documentation elsewhere
and turn on the option to treat warnings as errors to ensure that no
poorly constructed rst is introduced. Cap sphinx<1.6.1, since that
version has a conflict with pbr right now.

Change-Id: I19b3332229e2094988cbf8968c42a0323194a209
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2017-05-09 07:35:45 -04:00
parent 84ce2f1c9b
commit 4db30f9f05
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.cfg
View File

@ -15,6 +15,7 @@ classifier =
all_files = 1 all_files = 1
build-dir = doc/build build-dir = doc/build
source-dir = doc/source source-dir = doc/source
warning-is-error = 1
[pbr] [pbr]
warnerrors = True warnerrors = True

8
tox.ini
View File

@ -37,8 +37,8 @@ commands = bash -c "find {toxinidir} \
deps = deps =
Pygments Pygments
docutils docutils
sphinx>=1.1.2,<1.2 sphinx>=1.5.1,<1.6.1
pbr>=0.6,!=0.7,<1.0 pbr>=2.0.0,!=2.1.0
oslosphinx oslosphinx
nwdiag nwdiag
blockdiag blockdiag
@ -52,8 +52,8 @@ commands =
[testenv:venv] [testenv:venv]
deps = deps =
pbr>=0.6,!=0.7,<1.0 pbr>=2.0.0,!=2.1.0
sphinx>=1.1.2,<1.2 sphinx>=1.5.1,<1.6.1
oslosphinx oslosphinx
blockdiag blockdiag
sphinxcontrib-blockdiag sphinxcontrib-blockdiag