From 415ee2362d30ecce72773f954c7b6da151861c39 Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Thu, 30 May 2019 19:07:19 +0000 Subject: [PATCH] Move doc requirements to doc/requirements.txt This is the standard way to handle doc requirements now. Change-Id: I2487e70168566506df3c34687ca4cfa1bdd2ef4a --- oslo.{{cookiecutter.module_name}}/doc/requirements.txt | 7 +++++++ oslo.{{cookiecutter.module_name}}/test-requirements.txt | 5 ----- oslo.{{cookiecutter.module_name}}/tox.ini | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 oslo.{{cookiecutter.module_name}}/doc/requirements.txt diff --git a/oslo.{{cookiecutter.module_name}}/doc/requirements.txt b/oslo.{{cookiecutter.module_name}}/doc/requirements.txt new file mode 100644 index 0000000..0189c98 --- /dev/null +++ b/oslo.{{cookiecutter.module_name}}/doc/requirements.txt @@ -0,0 +1,7 @@ +# 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 +openstackdocstheme>=1.20.0 diff --git a/oslo.{{cookiecutter.module_name}}/test-requirements.txt b/oslo.{{cookiecutter.module_name}}/test-requirements.txt index 43716de..e4e6a74 100644 --- a/oslo.{{cookiecutter.module_name}}/test-requirements.txt +++ b/oslo.{{cookiecutter.module_name}}/test-requirements.txt @@ -4,8 +4,3 @@ hacking<0.11,>=0.10.0 oslotest>=1.5.1 - -# 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 -openstackdocstheme>=1.20.0 diff --git a/oslo.{{cookiecutter.module_name}}/tox.ini b/oslo.{{cookiecutter.module_name}}/tox.ini index 2b0e931..e6bacdb 100644 --- a/oslo.{{cookiecutter.module_name}}/tox.ini +++ b/oslo.{{cookiecutter.module_name}}/tox.ini @@ -30,6 +30,7 @@ commands = [testenv:docs] commands = sphinx-build -W -b html doc/source doc/build/html +deps = -r{toxinidir}/doc/requirements.txt [testenv:debug] commands = oslo_debug_helper {posargs}