From cf7175c1ccb7651ab629e63679e8f8203ef9e3d0 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Mon, 1 Oct 2018 16:47:23 -0400
Subject: [PATCH] update sphinx

Update to a newer version of sphinx and remove the version caps.

Ignore warnings for non-local images.

Stop using pbr's deprecated sphinx integration, and have tox call
sphinx-build directly instead.

Change-Id: I9363265647ad84cc06c499858acddab2a0b84940
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 doc/source/conf.py | 4 ++++
 requirements.txt   | 5 ++---
 setup.cfg          | 5 -----
 tox.ini            | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index fdec279..e0653fb 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,6 +37,10 @@ exclude_patterns = [
     '**/**/template.rst'
 ]
 
+suppress_warnings = [
+    'image.nonlocal_uri',
+]
+
 # Optionally allow the use of sphinxcontrib.spelling to verify the
 # spelling of the documents.
 try:
diff --git a/requirements.txt b/requirements.txt
index a4b4008..5d503ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,10 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr<2.0,>=1.3
+pbr>=1.3
 doc8 # Apache-2.0
-docutils>=0.11,!=0.13.1  # OSI-Approved Open Source, Public Domain
 oslosphinx>=2.5.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx>=1.8.1
 testrepository>=0.0.18
 testtools>=1.4.0
 yasfb>=0.5.1
diff --git a/setup.cfg b/setup.cfg
index 523968d..62c4216 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,11 +15,6 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
 [pbr]
 warnerrors = True
 
diff --git a/tox.ini b/tox.ini
index 721fce8..fa82d73 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,4 +19,4 @@ commands = {posargs}
 [testenv:docs]
 commands =
   doc8 -e .rst specs/ doc/ README.rst
-  python setup.py build_sphinx
+  sphinx-build -a -W -b html doc/source doc/build/html {posargs}