From 65728902e3c5c4df90bff5dc6c0c4df11f8fb53b Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 21 Aug 2023 09:46:22 +0900 Subject: [PATCH] Use upper-constraint in doc generation Currently doc jobs are broken because the latest sphinx 7.2.0 is not compatible with the latest release of openstackdocstheme. This updates the docs/releasenotes target to use the global upper constraints to avoid that issue. Change-Id: I7eef81e2cfc2156dd8aa076e09de4904dda6eb9a --- tox.ini | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index a089625f..95026545 100644 --- a/tox.ini +++ b/tox.ini @@ -7,12 +7,12 @@ ignore_basepython_conflict = True usedevelop = True basepython = python3 setenv = - VIRTUAL_ENV={envdir} - OS_TEST_PATH=./castellan/tests/unit + VIRTUAL_ENV={envdir} + OS_TEST_PATH=./castellan/tests/unit deps = - -c{env:TOX_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} - -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt commands = stestr run --slowest --concurrency=1 {posargs} [testenv:pep8] @@ -53,10 +53,12 @@ commands = # This environment is called from CI scripts to test and publish # the main docs to https://docs.openstack.org/castellan description = Build main documentation -deps = -r{toxinidir}/doc/requirements.txt +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt commands= - rm -rf doc/build doc/build/doctrees - sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html + rm -rf doc/build doc/build/doctrees + sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html allowlist_externals = rm [testenv:pdf-docs]