From c80448dd8bd0d2cd9df44ffc6a80f7c6abd0eb8e Mon Sep 17 00:00:00 2001 From: caoyuan Date: Sat, 6 Jul 2019 01:29:45 +0800 Subject: [PATCH] Move doc related modules to doc/requirements.txt Change-Id: I3d2e5e2322ac8374881f76217e35792efeea073a --- doc/requirements.txt | 8 ++++++++ test-requirements.txt | 6 ------ tox.ini | 9 ++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 0000000..04b5493 --- /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. + +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 +openstackdocstheme>=1.18.1 diff --git a/test-requirements.txt b/test-requirements.txt index cf3bc33..84781a0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,9 +5,3 @@ hacking<0.11,>=0.10.0 oslotest>=1.5.1 stestr>=2.0.0 - -# These are needed for docs generation -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 -openstackdocstheme>=1.18.1 diff --git a/tox.ini b/tox.ini index 3154b16..55bb1f1 100644 --- a/tox.ini +++ b/tox.ini @@ -39,7 +39,14 @@ commands = [testenv:docs] basepython = python3 -commands = sphinx-build -W -b html doc/source doc/build/html +whitelist_externals = + rm +deps = + {[testenv]deps} + -r{toxinidir}/doc/requirements.txt +commands = + rm -rf doc/build + sphinx-build -W -b html doc/source doc/build/html [testenv:debug] basepython = python3