From 1e58027156ea77555b86c7d878215d029006cce7 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Tue, 27 Dec 2022 01:23:08 +0000 Subject: [PATCH] Update tox.ini to work with tox 4 This change will allow this repo to pass zuul now that this has merged: https://review.opendev.org/c/zuul/zuul-jobs/+/866943 Tox 4 deprecated whitelist_externals. Replace whitelist_externals with allowlist_externals Zuul is pinned to use tox < 4 in order for the py39 unit tests to pass. Additional changes for skipsdist may be required in order to work properly with tox 4. Partial-Bug: #2000399 Signed-off-by: Al Bailey Change-Id: Iab988c50b18d683a0d0967cbcc31bbad621005f8 --- .zuul.yaml | 2 ++ python-k8sapp-platform/k8sapp_platform/tox.ini | 2 +- tox.ini | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index e7f4be1..9ca7103 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,7 @@ --- - project: + vars: + ensure_tox_version: '<4' check: jobs: - openstack-tox-linters diff --git a/python-k8sapp-platform/k8sapp_platform/tox.ini b/python-k8sapp-platform/k8sapp_platform/tox.ini index fed0a63..af21200 100644 --- a/python-k8sapp-platform/k8sapp_platform/tox.ini +++ b/python-k8sapp-platform/k8sapp_platform/tox.ini @@ -18,7 +18,7 @@ usedevelop = True sitepackages = False # tox is silly... these need to be separated by a newline.... -whitelist_externals = bash +allowlist_externals = bash find install_command = pip install --use-deprecated legacy-resolver \ diff --git a/tox.ini b/tox.ini index c1ff2ef..27a7250 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ setenv = deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -whitelist_externals = +allowlist_externals = bash [testenv:bashate]