From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 11 Dec 2022 16:13:58 +0000 (-0500)
Subject: adjust for tox changes to passenv
X-Git-Tag: rel_2_0_0rc1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b03f5aa016840e105bde431a5d5cfd28f945f3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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
index 0000000000..f37829fc37
--- /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 4af7225e2e..444583c198 100644
--- a/tox.ini
+++ b/tox.ini
@@ -115,7 +115,22 @@ 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 EXTRA_ORACLE_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
+    EXTRA_ORACLE_DRIVERS
 
 commands=