summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-09-05 17:20:05 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-09-05 17:20:05 -0400
commit2e137b3954f57c0b2e1977419ccecda35b5265b2 (patch)
tree2b0ca005600b1ede6db6e449d94eeae9843d665c
parent8a85729dc19520eb3a610137d9005bab3db5761b (diff)
downloadsqlalchemy-2e137b3954f57c0b2e1977419ccecda35b5265b2.tar.gz
- add separate oracle / oracle5 jobs so we can CI
on both series for now Change-Id: Ide8938334c248119c1d5c2e1bf07070f17c86242
-rw-r--r--tox.ini13
1 files changed, 7 insertions, 6 deletions
diff --git a/tox.ini b/tox.ini
index c1e24ee67..bad98c9c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,8 @@ deps=pytest
mysql: mysqlclient
mysql: pymysql
# waiting for https://github.com/oracle/python-cx_Oracle/issues/75
- oracle: cx_oracle<=6.0.1
+ oracle: cx_oracle>=6.0.2
+ oracle5: cx_oracle==5.2.1
mssql: pyodbc
mssql: pymssql
cov: pytest-cov
@@ -49,16 +50,16 @@ setenv=
BASECOMMAND=python -m pytest --log-info=sqlalchemy.testing
WORKERS={env:TOX_WORKERS:-n4}
- oracle: WORKERS={env:TOX_WORKERS:-n2}
+ oracle,oracle5: WORKERS={env:TOX_WORKERS:-n2}
nocext: DISABLE_SQLALCHEMY_CEXT=1
cov: COVERAGE={[testenv]cov_args}
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}
+ oracle,oracle5: ORACLE={env:TOX_ORACLE:--db oracle}
mssql: MSSQL={env:TOX_MSSQL:--db mssql --db mssql_pymssql}
- oracle,mssql: IDENTS=--write-idents db_idents.txt
- oracle,mssql: NOMEMORY=--nomemory
+ oracle,oracle5,mssql: IDENTS=--write-idents db_idents.txt
+ oracle,oracle5,mssql: NOMEMORY=--nomemory
backendonly: BACKENDONLY=--backend-only
# tox as of 2.0 blocks all environment variables from the
@@ -70,7 +71,7 @@ passenv=ORACLE_HOME NLS_LANG TOX_POSTGRESQL TOX_MYSQL TOX_ORACLE TOX_MSSQL TOX_S
commands=
nocext: sh -c "rm -f lib/sqlalchemy/*.so"
{env:BASECOMMAND} {env:WORKERS} {env:SQLITE:} {env:POSTGRESQL:} {env:MYSQL:} {env:ORACLE:} {env:MSSQL:} {env:BACKENDONLY:} {env:IDENTS:} {env:NOMEMORY:} {env:COVERAGE:} {posargs}
- oracle,mssql: python reap_dbs.py db_idents.txt
+ oracle,oracle5,mssql: python reap_dbs.py db_idents.txt
[testenv:pep8]
deps=flake8