Merge "update sphinx"

This commit is contained in:
Jenkins 2017-05-26 19:22:36 +00:00 committed by Gerrit Code Review
commit 4faa849565
2 changed files with 5 additions and 4 deletions

View File

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

View File

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