summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2022-12-11 11:13:58 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2022-12-11 13:50:50 -0500
commit45b03f5aa016840e105bde431a5d5cfd28f945f3 (patch)
tree1bdb4ecd410f1e36f7cbcec3de4140ee5a3ac384
parent2f5457627d4578b3af23ed8392a38de1632533de (diff)
downloadsqlalchemy-45b03f5aa016840e105bde431a5d5cfd28f945f3.tar.gz
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
-rw-r--r--doc/build/changelog/unreleased_14/tox_fix.rst6
-rw-r--r--tox.ini17
2 files changed, 22 insertions, 1 deletions
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 000000000..f37829fc3
--- /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 4af7225e2..444583c19 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=