diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-19 16:59:29 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-19 16:59:29 -0400 |
| commit | 9e6393c6b12397525053f4df9146894050b480d2 (patch) | |
| tree | 7addab41b1f704157652d6f50324e1d312ba5d6d | |
| parent | 31491a6acca68d6708e3e8ba1bc9ea842a54d5fe (diff) | |
| download | sqlalchemy-9e6393c6b12397525053f4df9146894050b480d2.tar.gz | |
- name these TOX_ so that we can set them unconditionally
without them getting used unless we ask for them in the
build
Change-Id: Iec157ce9e70366af275acac959527461faebfdc1
| -rw-r--r-- | tox.ini | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -47,21 +47,21 @@ setenv= PYTHONNOUSERSITE=1 BASECOMMAND=python -m pytest - WORKERS={env:WORKERS:-n4} - oracle: WORKERS={env: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={env:SQLITE:--db sqlite} - postgresql: POSTGRESQL={env:POSTGRESQL:--db postgresql} - mysql: MYSQL={env:MYSQL:--db mysql --db pymysql} - oracle: ORACLE={env:ORACLE:--db oracle} --write-idents oracle_idents.txt --nomemory - mssql: MSSQL={env: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 POSTGRESQL MYSQL ORACLE MSSQL SQLITE WORKERS +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= |