From 8ab40f465241480c9581672c7201670379ee7aae Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 18 Dec 2017 11:11:03 -0600
Subject: [PATCH] Add doc/requirements.txt file with doc requirements

The sphinx jobs need to find doc requirements in either
test-requiremnts.txt or doc/requirements.txt. Putting them directly in
to tox.ini, not so much.

Amended to use matching stable/ocata requirements.

Change-Id: I98a43b511a6949fa4f00c26eec224d24d6fa6588
(cherry picked from commit 4187d2fc4adbebf84e5d03e2f5c1c587b4bc9d04)
---
 doc/requirements.txt | 10 ++++++++++
 tox.ini              | 19 ++-----------------
 2 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000000..d291916a66
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,10 @@
+pbr>=0.6,!=0.7,<1.0
+
+Pygments
+docutils
+sphinx>=1.1.2,<1.2
+oslosphinx
+nwdiag
+blockdiag
+sphinxcontrib-blockdiag
+sphinxcontrib-nwdiag
diff --git a/tox.ini b/tox.ini
index 55a06d0cae..74436b0f26 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,16 +34,7 @@ commands = bash -c "find {toxinidir}             \
          -print0 | xargs -0 bashate -v -iE006 -eE005,E042"
 
 [testenv:docs]
-deps =
-   Pygments
-   docutils
-   sphinx>=1.1.2,<1.2
-   pbr>=0.6,!=0.7,<1.0
-   oslosphinx
-   nwdiag
-   blockdiag
-   sphinxcontrib-blockdiag
-   sphinxcontrib-nwdiag
+deps = -r{toxinidir}/doc/requirements.txt
 whitelist_externals = bash
 setenv =
   TOP_DIR={toxinidir}
@@ -51,11 +42,5 @@ commands =
   python setup.py build_sphinx
 
 [testenv:venv]
-deps =
-   pbr>=0.6,!=0.7,<1.0
-   sphinx>=1.1.2,<1.2
-   oslosphinx
-   blockdiag
-   sphinxcontrib-blockdiag
-   sphinxcontrib-nwdiag
+deps = -r{toxinidir}/doc/requirements.txt
 commands = {posargs}