From d9ffc590310f7d65a750bf67d298a591e65fcce5 Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Sat, 6 Jul 2019 01:15:50 +0800
Subject: [PATCH] Move doc related modules to doc/requirements.txt

Change-Id: I995f7c4e0152a19d2ae2890d6940419f30638444
---
 .gitignore            | 2 ++
 doc/requirements.txt  | 8 ++++++++
 test-requirements.txt | 5 -----
 tox.ini               | 7 ++++++-
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 doc/requirements.txt

diff --git a/.gitignore b/.gitignore
index b8181f2c..42f8291c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@ ChangeLog
 
 # reno build
 releasenotes/build
+releasenotes/notes/reno.cache
+RELEASENOTES.rst
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 00000000..e009c0df
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
+reno>=2.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 1f12c102..2116efbb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,12 +9,7 @@ oslotest>=3.2.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 
-# These are needed for docs generation/testing
-openstackdocstheme>=1.18.1 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4' # BSD
 doc8>=0.6.0 # Apache-2.0
-reno>=2.5.0 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 
diff --git a/tox.ini b/tox.ini
index 5d730993..a206710b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,6 +10,7 @@ setenv =
 install_command = pip install {opts} {packages}
 deps =
   -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+  -r{toxinidir}/doc/requirements.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 whitelist_externals = find
@@ -30,7 +31,11 @@ commands = {posargs}
 
 [testenv:docs]
 basepython = python3
-commands = sphinx-build -W -b html doc/source doc/build/html {posargs}
+whitelist_externals =
+  rm
+commands =
+  rm -rf doc/build
+  sphinx-build -W -b html doc/source doc/build/html {posargs}
 
 [testenv:cover]
 basepython = python3