From f69ddf31e3b4a01669d9028a57c176216e9042e9 Mon Sep 17 00:00:00 2001
From: zhurong <aaronzhu1121@gmail.com>
Date: Mon, 30 Jul 2018 10:40:13 +0800
Subject: [PATCH] murano-aget PTI docs build

Change-Id: I1959abc012d9d3bb55cd79adc8fee7976fc48041
---
 doc/requirements.txt  | 5 +++++
 setup.cfg             | 6 ------
 test-requirements.txt | 5 -----
 tox.ini               | 8 ++++++++
 4 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..7b1977e5
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,5 @@
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinxcontrib-pecanwsme>=0.8.0 # Apache-2.0
+sphinxcontrib-httpdomain>=1.3.0 # BSD
+reno>=2.5.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 899f2bcd..7b7ded1b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,12 +35,6 @@ oslo.config.opts =
 console_scripts =
     muranoagent = muranoagent.cmd.run:main
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
 [egg_info]
 tag_build =
 tag_date = 0
diff --git a/test-requirements.txt b/test-requirements.txt
index 8e82374a..b7c1f8ad 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,8 +8,3 @@ mock>=2.0.0 # BSD
 testtools>=2.3.0 # MIT
 stestr>=2.0.0 # Apache-2.0
 oslotest>=3.3.0 # Apache-2.0
-
-# doc build requirements
-openstackdocstheme>=1.20.0 # Apache-2.0
-sphinx>=1.6.5,!=1.6.6,!=1.6.7 # BSD
-reno>=2.7.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 32f27645..e938f357 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,6 +39,10 @@ commands =
 
 [testenv:docs]
 basepython = python3
+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 -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
 
 [testenv:pyflakes]
@@ -52,6 +56,10 @@ commands = oslo-config-generator --config-file etc/oslo-config-generator/muranoa
 
 [testenv:releasenotes]
 basepython = python3
+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 -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [flake8]