From a1f135ab9cb1e9521c39e4c706e5ff2674aed856 Mon Sep 17 00:00:00 2001 From: Ron Stone Date: Tue, 30 Apr 2024 16:20:32 +0000 Subject: [PATCH] Test tox 4 - DO NOT MERGE Change-Id: I8664bbd473b84be0b8c90db16ecd280bb9f8b077 Signed-off-by: Ron Stone --- .zuul.yaml | 3 ++- tox.ini | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 0cbce6540..f098215e1 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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: diff --git a/tox.ini b/tox.ini index a0d412724..d56471af8 100644 --- a/tox.ini +++ b/tox.ini @@ -40,7 +40,7 @@ commands = sphinx-build -a -E -W --keep-going -d doc/build/doctrees -t starlingx -t openstack -t virtual -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 +allowlist_externals = bash hide-empty-rows.sh htmlChecks.sh get-remote-files.sh @@ -55,7 +55,7 @@ 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 +allowlist_externals = bash hide-empty-rows.sh htmlChecks.sh get-remote-files.sh @@ -66,10 +66,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 \) \ @@ -87,13 +87,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