From 1b22d279e81c565396b126a40d0760d46ddf6ce7 Mon Sep 17 00:00:00 2001 From: Christopher Dearborn Date: Thu, 6 Feb 2020 16:30:24 -0500 Subject: [PATCH] Create doc requirements.txt This patch creates a new doc/requirements.txt file, moves into it the required packages from test-requirements.txt, and makes the necessary changes to the docs build to fix the dependencies. Change-Id: I6cc9aadc6359fac5b985afb370bd4e33d4749b74 --- doc/requirements.txt | 7 +++++++ test-requirements.txt | 3 --- tox.ini | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 0000000..073d2a4 --- /dev/null +++ b/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,<2.0.0;python_version=='2.7' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD +openstackdocstheme # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index ca569aa..94c7246 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,3 @@ doc8 hacking>=1.1.0,<1.2.0 # Apache-2.0 mock>=2.0 requests-mock>=1.0 -sphinx!=1.6.6,!=1.6.7,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0;python_version>='3.4' # BSD -openstackdocstheme # Apache-2.0 diff --git a/tox.ini b/tox.ini index b5c7036..dd31147 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ commands = deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt + -r{toxinidir}/doc/requirements.txt commands = sphinx-build -b html doc/source doc/build/html