From 9a2fd614cabc5c5c9a5619eff322913371c6a7e5 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 18 May 2018 17:57:08 +0200 Subject: [PATCH] Install all dependencies when building docs RTD cannot install several requirements files (SIGH), not does it use pip to install projects (SIGH#2). This change creates a new requirement file doc/joined-requirements.txt and links to both doc/requirements.txt and root requirements.txt from it. Note that we cannot put -r instructions to doc/requirements.txt since it's managed by global-requirements. Change-Id: Iaebf5917dc20d063e506a055d9f5af4daee0415b --- doc/joined-requirements.txt | 4 ++++ tox.ini | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 doc/joined-requirements.txt diff --git a/doc/joined-requirements.txt b/doc/joined-requirements.txt new file mode 100644 index 0000000..3b4c245 --- /dev/null +++ b/doc/joined-requirements.txt @@ -0,0 +1,4 @@ +# This file is needed because readthedocs people refuse to support several +# requirements files at once, and using autodoc requires installing both. +-r requirements.txt +-r ../requirements.txt diff --git a/tox.ini b/tox.ini index 2805b51..977df70 100644 --- a/tox.ini +++ b/tox.ini @@ -31,8 +31,7 @@ commands = [testenv:docs] 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 + -r{toxinidir}/doc/joined-requirements.txt commands = sphinx-build -a -E -W -b html doc/source doc/build/html