From: Mike Bayer Date: Mon, 25 Jan 2016 00:29:26 +0000 (-0500) Subject: - unfortunately we have to force the paths to be shorter due to X-Git-Tag: rel_1_1_0b1~84^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ad5599229583caf1c29c84b128e0de712786ee2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - unfortunately we have to force the paths to be shorter due to https://github.com/pypa/virtualenv/issues/596 --- diff --git a/tox.ini b/tox.ini index 1742f71501..550cfa3136 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] -envlist = py{26,27,34,35}-sqla_{cext,nocext}-db_{default,sqlitepg,mysql,oracle,mssql} +envlist = py{26,27,34,35}-{cext,nocext}-{default,sqlitepg,mysql,oracle,mssql} [testenv] deps=pytest @@ -19,7 +19,7 @@ deps=pytest setenv= PYTHONPATH= PYTHONNOUSERSITE=1 - sqla_nocext: DISABLE_SQLALCHEMY_CEXT=1 + nocext: DISABLE_SQLALCHEMY_CEXT=1 # tox as of 2.0 blocks all environment variables from the @@ -29,11 +29,11 @@ passenv=ORACLE_HOME NLS_LANG commands= - db_{default}: python -m pytest -n4 --dropfirst {posargs} - db_{sqlitepg}: python -m pytest -n4 --dropfirst --db sqlite --db postgresql {posargs} - db_{mysql}: python -m pytest -n4 --dropfirst --db mysql --db pymysql {posargs} - db_{oracle}: python -m pytest -n4 --dropfirst --db oracle {posargs} - db_{mssql}: python -m pytest -n4 --dropfirst --db pyodbc --db pymssql {posargs} + {default}: python -m pytest -n4 --dropfirst {posargs} + {sqlitepg}: python -m pytest -n4 --dropfirst --db sqlite --db postgresql {posargs} + {mysql}: python -m pytest -n4 --dropfirst --db mysql --db pymysql {posargs} + {oracle}: python -m pytest -n4 --dropfirst --db oracle {posargs} + {mssql}: python -m pytest -n4 --dropfirst --db pyodbc --db pymssql {posargs} [testenv:coverage]