- backport new tox from 1.2

Change-Id: I212fad7eb330446f2cddfa0f416fc7ce3a09e6cc

diff --git a/tox_1_1.ini b/tox_1_1.ini
index 299b0d6c099b006e45c53c4d905e10c7d5c5a8bb..9c4b6881e00efc1362c9737c6da0ea0071789875 100644 (file)
--- a/tox_1_1.ini
+++ b/tox_1_1.ini
@@ -47,21 +47,21 @@ setenv=
     PYTHONNOUSERSITE=1
     BASECOMMAND=python -m pytest
 
-    WORKERS=-n4
-    oracle: WORKERS=-n2
+    WORKERS={env:TOX_WORKERS:-n4}
+    oracle: WORKERS={env:TOX_WORKERS:-n2}
     nocext: DISABLE_SQLALCHEMY_CEXT=1
     cov: COVERAGE={[testenv]cov_args}
-    sqlite: SQLITE=--db sqlite
-    postgresql: POSTGRESQL=--db postgresql
-    mysql: MYSQL=--db mysql --db pymysql
-    oracle: ORACLE=--db oracle --write-idents oracle_idents.txt
-    mssql: MSSQL=--db pyodbc --db pymssql
+    sqlite: SQLITE={env:TOX_SQLITE:--db sqlite}
+    postgresql: POSTGRESQL={env:TOX_POSTGRESQL:--db postgresql}
+    mysql: MYSQL={env:TOX_MYSQL:--db mysql --db pymysql}
+    oracle: ORACLE={env:TOX_ORACLE:--db oracle} --write-idents oracle_idents.txt --nomemory
+    mssql: MSSQL={env:TOX_MSSQL:--db pyodbc --db pymssql}
     backendonly: BACKENDONLY=--backend-only
 
 # 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
+passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL TOX_MYSQL TOX_ORACLE TOX_MSSQL TOX_SQLITE TOX_WORKERS
 
 # for nocext, we rm *.so in lib in case we are doing usedevelop=True
 commands=
@@ -78,4 +78,3 @@ commands = python -m flake8 {posargs}
 show-source = True
 ignore = E711,E712,E721,N806,D
 exclude=.venv,.git,.tox,dist,doc,*egg,build
-