From f1d2641396a5f31faf972dc8210b41ed14876682 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Thu, 16 Mar 2017 16:16:44 +0000
Subject: Use Sphinx 1.5 warning-is-error

With pbr 2.0 and Sphinx 1.5, the setting for treat sphinx warnings as
errors is setting warning-is-error in build_sphinx section. Migrate the
setting from the old warnerrors one.

There are only three related fixes required.

Change-Id: I84b020c18a8a1c7c11a35bacd61523bbb094abe4
---
 setup.cfg | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'setup.cfg')

diff --git a/setup.cfg b/setup.cfg
index 0e0dd0a9..dc0bc305 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,9 +31,10 @@ console_scripts =
     nova = novaclient.shell:main
 
 [build_sphinx]
+all-files = 1
+warning-is-error = 1
 source-dir = doc/source
 build-dir = doc/build
-all_files = 1
 
 [upload_sphinx]
 upload-dir = doc/build/html
@@ -54,6 +55,3 @@ output_file = novaclient/locale/novaclient.pot
 
 [wheel]
 universal = 1
-
-[pbr]
-warnerrors = true
-- 
cgit v1.2.1