Upver tox and sphinx (r9, r8, r7, r6, r5)

Bump to tox 4, docultils 18.1 and sphinx 7

Change-Id: I8664bbd473b84be0b8c90db16ecd280bb9f8b077
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
This commit is contained in:
Ron Stone 2024-04-30 16:20:32 +00:00
parent fafe351c91
commit 7dd87caa1f
3 changed files with 19 additions and 15 deletions

View File

@ -1,7 +1,8 @@
---
- project:
vars:
ensure_tox_version: '<4'
# ensure_tox_version: '<4'
ensure_tox_version: '>=4.14.2'
templates:
- stx-api-ref-jobs
check:

View File

@ -1,7 +1,9 @@
#sphinx==4.2.0
sphinx==5.0
sphinx==7.0
openstackdocstheme>=2.2.1,<=2.3.1 # Apache-2.0
docutils==0.17.1
docutils==0.18.1
PyYAML==6.0
sphinx-tabs<=3.4.1
# API Reference Guide
os-api-ref>=1.5.0 # Apache-2.0

25
tox.ini
View File

@ -9,6 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
OS_STDOUT_CAPTURE=1
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
LC_ALL=C
deps = -r{toxinidir}/test-requirements.txt
[testenv:prebuild-docs]
@ -43,10 +44,10 @@ commands =
sphinx-build -a -E -W --keep-going -d doc/build/doctrees -t starlingx -t openstack -b html doc/source doc/build/html {posargs}
{[testenv:postbuild-docs]commands}
# Note: The dev env for the docs team uses a version of tox that does not yet support allowlist_externals
whitelist_externals = bash
hide-empty-rows.sh
htmlChecks.sh
get-remote-files.sh
allowlist_externals = bash
./hide-empty-rows.sh
./htmlChecks.sh
./get-remote-files.sh
git
# hw-updates.sh
@ -58,10 +59,10 @@ commands =
{[testenv:prebuild-docs]commands}
sphinx-build -a -E -W --keep-going -d doc/build/doctrees -t starlingx -t openstack -b singlehtml doc/source doc/build/singlepage {posargs}
{[testenv:postbuild-docs]commands}
whitelist_externals = bash
hide-empty-rows.sh
htmlChecks.sh
get-remote-files.sh
allowlist_externals = bash
./hide-empty-rows.sh
./htmlChecks.sh
./get-remote-files.sh
git
[testenv:api-ref]
@ -69,10 +70,10 @@ deps = {[testenv:docs]deps}
commands =
rm -rf api-ref/build
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
whitelist_externals = rm
allowlist_externals = rm
[testenv:linters]
whitelist_externals = bash
allowlist_externals = bash
commands =
bash -c "find {toxinidir} \
\( -name .tox -prune \) \
@ -90,13 +91,13 @@ passenv=PWD
commands =
bash -c "echo Running in {env:PWD}"
bash new-topic.sh {env:PWD} {toxinidir}
whitelist_externals = new-topic.sh
allowlist_externals = ./new-topic.sh
bash
[testenv:picks]
commands =
./pickCompare.sh
whitelist_externals = pickCompare.sh
allowlist_externals = ./pickCompare.sh
bash