From 7bae6bdbab4f2fd938bab81c32a72819ae58b5ea Mon Sep 17 00:00:00 2001
From: gord chung <gord@live.ca>
Date: Mon, 15 Jan 2018 13:43:22 +0000
Subject: [PATCH] Fix doc builds

The updated releasenote and requirements jobs expect requirements for
docs in one of the requirements files. Move requirements from setup.cfg
to doc/requirements.txt file.

See also
https://governance.openstack.org/tc/reference/project-testing-interface.html#documentation

Change-Id: Ic454831a80f799c2be5ba3089001f31f68c39f85
---
 doc/requirements.txt | 2 ++
 setup.cfg            | 3 ---
 tox.ini              | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..00f4f5b
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,2 @@
+sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.11.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 0e974f5..0778ff1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,9 +33,6 @@ test =
     pifpaf[gnocchi]>=0.23
     gnocchi[postgresql,file]
     mock>=1.2  # BSD
-doc =
-    sphinx>=1.6.2 # BSD
-    openstackdocstheme>=1.11.0 # Apache-2.0   
 
 [entry_points]
 console_scripts =
diff --git a/tox.ini b/tox.ini
index 0eaef85..70327e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ commands = flake8
 
 [testenv:venv]
 # Used by openstack-infra to build the doc
-deps = .[doc]
+deps = -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
 
 [testenv:cover]
@@ -36,7 +36,7 @@ commands =
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:docs]
-deps = .[doc]
+deps = -r{toxinidir}/doc/requirements.txt
 commands =
    rm -rf doc/source/ref
    python setup.py build_sphinx