From 4db30f9f05ad8aba9001d444313ee2915f86ecd1 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 9 May 2017 07:35:45 -0400 Subject: [PATCH] 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 --- setup.cfg | 1 + tox.ini | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3487f6541b..73d22b5268 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,6 +15,7 @@ classifier = all_files = 1 build-dir = doc/build source-dir = doc/source +warning-is-error = 1 [pbr] warnerrors = True diff --git a/tox.ini b/tox.ini index 55a06d0cae..cc7c5444a8 100644 --- a/tox.ini +++ b/tox.ini @@ -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