From 853dbddc2259fef333f0b5f3e6f215357e071a0b Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 18 Dec 2017 13:54:23 -0600
Subject: [PATCH] Split doc requirements into their own file

We don't need sphinx in the test virtualenvs, but we do need it for
docs.

Change-Id: I8ae98d08090e2e391ba725ddd5ff0125a03c8d47
Depends-On: Ie0c9f24df09255e871f904e079b68809144b36b4
---
 doc/requirements.txt  | 2 ++
 test-requirements.txt | 2 --
 tox.ini               | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..3c822d2c
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,2 @@
+sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.17.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 0fd25e48..795e6af7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,8 +9,6 @@ oslo.config>=4.6.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 requests-mock>=1.1.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 tempest>=17.1.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index bedd4490..0fa1b2e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,8 +25,11 @@ commands =
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 
 [testenv:docs]
-commands = rm -rf doc/build
-           python setup.py build_sphinx
+deps =
+       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+       -r{toxinidir}/requirements.txt
+       -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
 
 [testenv:flake8]
 commands = flake8