*: s/whitelist_externals/allowlist_externals/

as allowlist_externals was introduced in
tox v4.0. see
https://github.com/tox-dev/tox/commit/5e33fda1a40ffb4973de3d607a572891eb3cb2d2 , but
this option was backported to 3.18 as an alias of whitelist_externals, so we don't need
to specify the minversion to 4.0 in this change.

as we started using tox 4.0 and up (v4.0.2 in specific). tox complains
and fails like:

alerts-lint: failed with promtool is not allowed, use allowlist_externals to allow it
  alerts-lint: FAIL code 1 (9.25 seconds)

see https://tox.wiki/en/latest/faq.html#tox-4-removed-tox-ini-keys
and https://tox.wiki/en/latest/config.html#allowlist_externals

it'd be nice to use a more inclusive language also. so, in this change,
s/whitelist_externals/allowlist_externals/ in all tox.ini in this
project.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 34e2e33870b1ce381f9cd3eead882daa7b640b81)

diff --git a/monitoring/ceph-mixin/tox.ini b/monitoring/ceph-mixin/tox.ini
index 06d014a2c278b4ad5fbded21b5116262db9c56cc..743f4bca63a5bfed0f3308d631fde21449bd2407 100644 (file)
--- a/monitoring/ceph-mixin/tox.ini
+++ b/monitoring/ceph-mixin/tox.ini
@@ -8,7 +8,7 @@ envlist =
 skipsdist = true
 
 [testenv:jsonnet-bundler-{install,update}]
-whitelist_externals =
+allowlist_externals =
     jb
 description =
     install: Install the jsonnet dependencies
@@ -19,7 +19,7 @@ commands =
 
 [testenv:jsonnet-{check,fix,lint}]
 basepython = python3
-whitelist_externals =
+allowlist_externals =
     find
     jb
     jsonnet
@@ -56,7 +56,7 @@ deps =
     -rrequirements-lint.txt
 depends = grafonnet-check
 setenv =
-whitelist_externals =
+allowlist_externals =
   promtool
 commands =
     python -m doctest tests_dashboards/util.py
@@ -67,7 +67,7 @@ deps =
     -rrequirements-alerts.txt
     pytest
 depends = grafonnet-check
-whitelist_externals =
+allowlist_externals =
   promtool
 commands =
     fix: jsonnet -J vendor -S alerts.jsonnet -o prometheus_alerts.yml

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
index 508d1b4c6cd0211ff358c2372f694b3a18373308..45dd7e7335f9a24ed8e8ec84d5a033eb1f84d8eb 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/tox.ini
@@ -4,7 +4,7 @@ skipsdist = True
 
 [testenv]
 deps = mock
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     git

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
index bec30e6d7cb4f6ec92333cbcf424960ef17bcf33..0a01a79e62206c4c8bd426999d1d8fe2280c70fe 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
@@ -4,7 +4,7 @@ skipsdist = True
 
 [testenv]
 deps = mock
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     git

diff --git a/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini b/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
index 1fdfe26a8768256a17bff6b570e17e0d96faa06d..2d8f8980535d7b4a5173b6ac019b4561205f995e 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
+++ b/src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
@@ -4,7 +4,7 @@ skipsdist = True
 
 [testenv]
 deps = mock
-whitelist_externals =
+allowlist_externals =
     vagrant
     bash
     git

diff --git a/src/ceph-volume/shell_tox.ini b/src/ceph-volume/shell_tox.ini
index e5c390271344bc591bc59fed54dc26e81f35f8fa..2950c8a09db2288f0156c985fb930c37285ce6db 100644 (file)
--- a/src/ceph-volume/shell_tox.ini
+++ b/src/ceph-volume/shell_tox.ini
@@ -4,7 +4,7 @@ skip_missing_interpreters = true
 
 [testenv]
 passenv=*
-whitelist_externals=
+allowlist_externals=
   bash
   grep
   mktemp