From b833960c69645ccbb9c57af99704da6df1676fd2 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 12 Feb 2017 16:54:55 +0100
Subject: [PATCH] Fix requirements update

Sphinx 1.5 fails with current pbr (needs new pbr release, see change
I52d45fa0a0d42de690d3a492068f7bb03483a224.

For now, set warnerrors to False to be able to use this.

Also, remove duplicate requirements line.

Also, update to new sphinx version to show that this works.

This is in reaction to the failure in
Ia184446fe34c49a48ca079c828157ea34e662d4b.

Change-Id: I9e7261c4124b71eeb6bddd9e21747b61bbdc16fa
---
 requirements.txt      | 1 -
 setup.cfg             | 3 ++-
 test-requirements.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 21abb554..83b6f95b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,4 +7,3 @@ pbr>=1.8 # Apache-2.0
 PyYAML>=3.10.0 # MIT
 flake8<2.6.0,>=2.5.4 # MIT
 six>=1.9.0 # MIT
-oslosphinx>=4.7.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index f352c6d8..45b6e499 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,7 +42,8 @@ mapping_file = babel.cfg
 output_file = diskimage_builder/locale/diskimage_builder.pot
 
 [pbr]
-warnerrors = True
+# TODO(jaegerandi): Set to True once pbr 1.11.0 is out.
+warnerrors = False
 
 [update_catalog]
 domain = diskimage_builder
diff --git a/test-requirements.txt b/test-requirements.txt
index a30316a7..931ecaad 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,7 +7,7 @@ oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 
 # Doc requirements
-sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+sphinx>=1.5.1 # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 
 # releasenotes