From 47ceef043a71e0a2e91188e4720ce59934624c1b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 9 May 2019 13:58:13 +0000 Subject: [PATCH] Shift doc requirements to doc/requirements.txt We have doc requirements in the normal test-requirements list. This is causing problems for some sphinx related things which want python3 conflicting with our py27 test job. Change-Id: I1c4ddba56377097f1ebf39051a496577d38f0494 --- doc/requirements.txt | 3 +++ test-requirements.txt | 3 --- tox.ini | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 000000000..1ff1bd640 --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,3 @@ +zuul-sphinx>=0.1.1 +sphinxcontrib-blockdiag>=1.1.0 +sphinxcontrib-seqdiag diff --git a/test-requirements.txt b/test-requirements.txt index b7e054615..a28500196 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,12 +15,9 @@ ansible>=2.5.1,<2.6 # https://review.openstack.org/567007 # We need to pin ansible-lint to before 4.0 which blows up all over the place ansible-lint<4 bashate>=0.2 -zuul-sphinx>=0.1.1 stestr>=1.0.0 # Apache-2.0 # For upload-logs-swift: openstacksdk>=0.17.1 requests requestsexceptions bs4 -sphinxcontrib-blockdiag>=1.1.0 -sphinxcontrib-seqdiag diff --git a/tox.ini b/tox.ini index 6f30ba105..3390674d0 100644 --- a/tox.ini +++ b/tox.ini @@ -22,6 +22,9 @@ deps = bindep commands = bindep test [testenv:docs] +deps = + -r{toxinidir}/test-requirements.txt + -r{toxinidir}/doc/requirements.txt commands = sphinx-build -E -W -d doc/build/doctrees -b html doc/source/ doc/build/html