From 2903040070a72c3579a531272d1b344c19f8f178 Mon Sep 17 00:00:00 2001 From: elajkat Date: Tue, 5 Jan 2021 12:52:45 +0100 Subject: [PATCH] Add doc/requirements We need to specify doc requirements in doc/requirements.txt to avoid problems with the pip resolver for the release team. Removed specific doc requirements from test-requirements.txt Change-Id: Ia88848fd9c4ce35d396bc186ae3894a1d5865db9 --- doc/requirements.txt | 4 ++++ test-requirements.txt | 4 ---- tox.ini | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 00000000..6fe7c34b --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,4 @@ +reno>=3.1.0 # Apache-2.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme>=2.2.1 # Apache-2.0 + diff --git a/test-requirements.txt b/test-requirements.txt index bf1c6266..f5bac7c8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,10 +7,6 @@ hacking>=3.2.0,<3.3.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 flake8-import-order==0.12 # LGPLv3 python-subunit>=1.0.0 # Apache-2.0/BSD -sphinx>=2.0.0,!=2.1.0 # BSD oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testtools>=2.2.0 # MIT -openstackdocstheme>=2.2.1 # Apache-2.0 -# releasenotes -reno>=3.1.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 3c18fbfe..d3e722a0 100644 --- a/tox.ini +++ b/tox.ini @@ -39,9 +39,12 @@ commands = coverage xml -o cover/coverage.xml [testenv:docs] +deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html [testenv:releasenotes] +deps = {[testenv:docs]deps} commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html