From 095580ec46757a1456316875017b58f53232e6c3 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Fri, 31 Mar 2017 00:13:19 +0000 Subject: [PATCH] Update sphinx to 1.5 Most projects now use sphinx 1.5. sphinx 1.5 provides some new directives which are possibly useful. sphinx 1.5 is a useful feature which considers warnings as error. It prevents sphinx warnings into documents. Also fixes existing sphinx warning. At the same time, requirements.txt is synced with global-requirements. Change-Id: I3b4a18a2483fa6966d8d4ac78dcb8ceac0524cf7 --- requirements.txt | 14 +++++++------- setup.cfg | 1 + setup.py | 2 +- specs/backlog/ocata/port-data-plane-status.rst | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 648488189..8a9b44e5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,14 @@ actdiag blockdiag nwdiag -oslosphinx -pbr>=0.6,!=0.7,<1.0 +oslosphinx>=4.7.0 # Apache-2.0 +pbr>=2.0.0 # Apache-2.0 seqdiag -sphinx>=1.1.2,<1.2 +sphinx>=1.5.1 # BSD sphinxcontrib-actdiag -sphinxcontrib-blockdiag +sphinxcontrib-blockdiag # BSD sphinxcontrib-nwdiag -sphinxcontrib-seqdiag -testrepository>=0.0.18 -testtools>=0.9.34 +sphinxcontrib-seqdiag # BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testtools>=1.4.0 # MIT yasfb>=0.5.1 diff --git a/setup.cfg b/setup.cfg index 98ea56a37..9c00d5328 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/setup.py b/setup.py index 70c2b3f32..357a741a7 100755 --- a/setup.py +++ b/setup.py @@ -18,5 +18,5 @@ import setuptools setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/specs/backlog/ocata/port-data-plane-status.rst b/specs/backlog/ocata/port-data-plane-status.rst index 3489213ab..cc29cee4e 100644 --- a/specs/backlog/ocata/port-data-plane-status.rst +++ b/specs/backlog/ocata/port-data-plane-status.rst @@ -150,7 +150,7 @@ Examples Updating port data plane status to down: -.. code-block:: json +.. code-block:: none PUT /v2.0/ports/ Accept: application/json