adjust for tox changes to passenv

Fixed issue in tox.ini file where changes in the tox 4.0 series to the
format of "passenv" caused tox to not function correctly, in particular
raising an error as of tox 4.0.6.

Change-Id: I659c8fc523a71deaa02a89103c9e7241cf81d831
References: https://github.com/tox-dev/tox/issues/2676

diff --git a/doc/build/changelog/unreleased_14/tox_fix.rst b/doc/build/changelog/unreleased_14/tox_fix.rst
new file mode 100644 (file)
index 0000000..f37829f
--- /dev/null
+++ b/doc/build/changelog/unreleased_14/tox_fix.rst
@@ -0,0 +1,6 @@
+.. change::
+    :tags: bug, tests
+
+    Fixed issue in tox.ini file where changes in the tox 4.0 series to the
+    format of "passenv" caused tox to not function correctly, in particular
+    raising an error as of tox 4.0.6.

diff --git a/tox.ini b/tox.ini
index 923c2cf3727f4ad099b147efa1ecba0c6e001786..f9727286590961a4a871a044a915831861c291cb 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -54,7 +54,7 @@ deps=
 
      cov: pytest-cov
 
-allowlist_externals=sh
+allowlist_externals=sh, /bin/true
 
 # PYTHONPATH - erased so that we use the build that's present
 # in .tox as the SQLAlchemy library to be imported
@@ -121,7 +121,21 @@ setenv=
 # tox as of 2.0 blocks all environment variables from the
 # outside, unless they are here (or in TOX_TESTENV_PASSENV,
 # wildcards OK).  Need at least these
-passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL TOX_POSTGRESQL_PY2K TOX_MYSQL TOX_MYSQL_PY2K TOX_ORACLE TOX_MSSQL TOX_SQLITE TOX_SQLITE_FILE TOX_WORKERS EXTRA_SQLITE_DRIVERS EXTRA_PG_DRIVERS EXTRA_MYSQL_DRIVERS
+passenv=
+    ORACLE_HOME
+    NLS_LANG
+    TOX_POSTGRESQL
+    TOX_POSTGRESQL_PY2K
+    TOX_MYSQL
+    TOX_MYSQL_PY2K
+    TOX_ORACLE
+    TOX_MSSQL
+    TOX_SQLITE
+    TOX_SQLITE_FILE
+    TOX_WORKERS
+    EXTRA_SQLITE_DRIVERS
+    EXTRA_PG_DRIVERS
+    EXTRA_MYSQL_DRIVERS
 
 # for nocext, we rm *.so in lib in case we are doing usedevelop=True
 commands=