From 1b365ba489fe8254f32a29447c718cc9e948d491 Mon Sep 17 00:00:00 2001
From: likui <likui@yovole.com>
Date: Tue, 29 Jun 2021 13:59:59 +0800
Subject: [PATCH] Changed minversion in tox to 3.18.0

The patch bumps min version of tox to 3.18.0 in order to
replace tox's whitelist_externals by allowlist_externals option:
https://github.com/tox-dev/tox/blob/master/docs/changelog.rst#v3180-2020-07-23

Change-Id: Ia815461a15bff065fd63e9ce80636e2b736bebdf
---
 tox.ini | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1384063b2f..0f649cbcab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-minversion = 2.5.0
+minversion = 3.18.0
 envlist = docs,py3,functional-py3,pep8,specs,pip-missing-reqs,pip-extra-reqs
 skipsdist = True
 ignore_basepython_conflict = True
@@ -11,7 +11,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONWARNINGS=default::DeprecationWarning
 install_command =
     pip install {opts} {packages}
-whitelist_externals = find
+allowlist_externals = find
 deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
@@ -26,13 +26,13 @@ deps =
     -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
-whitelist_externals = rm
+allowlist_externals = rm
 commands =
   rm -rf api-ref/build
   sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
 
 [testenv:cover]
-whitelist_externals = sh
+allowlist_externals = sh
 setenv =
     {[testenv]setenv}
     PYTHON=coverage run --source octavia --parallel-mode
@@ -85,7 +85,7 @@ commands = flake8
            {toxinidir}/tools/coding-checks.sh --pylint {posargs}
            {toxinidir}/tools/check_unit_test_structure.sh
            {[testenv:bashate]commands}
-whitelist_externals =
+allowlist_externals =
   sh
   find
   bash
@@ -96,7 +96,7 @@ deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
-whitelist_externals = rm
+allowlist_externals = rm
 commands =
   rm -rf doc/build api-guide/build api-ref/build doc/source/contributor/modules
   sphinx-build -W -b html doc/source doc/build/html
@@ -104,7 +104,7 @@ commands =
 
 [testenv:pdf-docs]
 deps = {[testenv:docs]deps}
-whitelist_externals =
+allowlist_externals =
   make
   rm
 commands =
@@ -116,7 +116,7 @@ commands =
 commands = {posargs}
 
 [testenv:genconfig]
-whitelist_externals = mkdir
+allowlist_externals = mkdir
 commands =
          mkdir -p etc/octavia
          oslo-config-generator --output-file etc/octavia/octavia.conf.sample \
@@ -128,14 +128,14 @@ commands =
          --namespace cotyledon
 
 [testenv:genpolicy]
-whitelist_externals = mkdir
+allowlist_externals = mkdir
 commands =
          mkdir -p etc/octavia
          oslopolicy-sample-generator \
          --config-file etc/policy/octavia-policy-generator.conf
 
 [testenv:specs]
-whitelist_externals =
+allowlist_externals =
   rm
   find
 commands =
@@ -201,7 +201,7 @@ max-line-length = 79
 deps =
     -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
     -r{toxinidir}/doc/requirements.txt
-whitelist_externals = rm
+allowlist_externals = rm
 commands =
   rm -rf releasenotes/build
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@@ -211,7 +211,7 @@ deps =
   -c{toxinidir}/lower-constraints.txt
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
-whitelist_externals = sh
+allowlist_externals = sh
 commands =
     sh -c 'OS_TEST_PATH={toxinidir}/octavia/tests/unit stestr run {posargs}'
     sh -c 'OS_TEST_PATH={toxinidir}/octavia/tests/functional stestr run {posargs}'
@@ -219,7 +219,7 @@ commands =
 [testenv:requirements]
 deps =
   -egit+https://opendev.org/openstack/requirements#egg=openstack-requirements
-whitelist_externals = sh
+allowlist_externals = sh
 commands =
     sh -c '{envdir}/src/openstack-requirements/playbooks/files/project-requirements-change.py --req {envdir}/src/openstack-requirements --local {toxinidir} master'