Ensure Oracle < 8 used for python 2 in tox

this is already in master, backporting to 1.3.

the issue of the oracle extras_require in setup.py
is a separate issue as master still has no version
qualification in this area either.

Change-Id: Ib612401aaa2d5d109b26bc18a0fc817a15a98bf8

diff --git a/tox.ini b/tox.ini
index 291b5452da87a498743e5317cad96b3efb5d6dd6..31e4d1892af9ca0590087e3b66ac10c610413701 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -27,10 +27,12 @@ deps=pytest!=3.9.1,!=3.9.2
      mysql: mysqlclient>=1.4.0
      mysql: pymysql
      mysql: mysql-connector-python
-     # waiting for https://github.com/oracle/python-cx_Oracle/issues/75
-     oracle: cx_oracle>=7.0
-     oracle6: cx_oracle>=6.0.2,!=6.3,!=6.4,<7.0
-     oracle5: cx_oracle==5.2.1
+
+     py3{,5,6,7,8,9,10,11}-oracle: cx_oracle>=7.0
+     py2{,7}-oracle: cx_oracle>=7.0,<8
+
+
+
      mssql: pyodbc
      cov: pytest-cov
 
@@ -56,17 +58,17 @@ setenv=
     BASECOMMAND=python -m pytest --log-info=sqlalchemy.testing
 
     WORKERS={env:TOX_WORKERS:-n4  --max-worker-restart=5}
-    oracle,oracle6,oracle5: WORKERS={env:TOX_WORKERS:-n2  --max-worker-restart=5}
+    oracle: WORKERS={env:TOX_WORKERS:-n2  --max-worker-restart=5}
     nocext: DISABLE_SQLALCHEMY_CEXT=1
     cov: COVERAGE={[testenv]cov_args}
     sqlite: SQLITE={env:TOX_SQLITE:--db sqlite}
     sqlite_file: SQLITE={env:TOX_SQLITE_FILE:--db sqlite_file}
     postgresql: POSTGRESQL={env:TOX_POSTGRESQL:--db postgresql}
     mysql: MYSQL={env:TOX_MYSQL:--db mysql --db pymysql}
-    oracle,oracle6,oracle5: ORACLE={env:TOX_ORACLE:--db oracle}
+    oracle: ORACLE={env:TOX_ORACLE:--db oracle}
     mssql: MSSQL={env:TOX_MSSQL:--db mssql}
-    oracle,oracle6,oracle5,mssql,sqlite_file: IDENTS=--write-idents db_idents.txt
-    oracle,oracle6,oracle5,mssql,sqlite_file: NOMEMORY=--nomemory
+    oracle,mssql,sqlite_file: IDENTS=--write-idents db_idents.txt
+    oracle,mssql,sqlite_file: NOMEMORY=--nomemory
     backendonly: BACKENDONLY=--backend-only
 
 # tox as of 2.0 blocks all environment variables from the
@@ -78,7 +80,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,oracle6,oracle5,mssql,sqlite_file: python reap_dbs.py db_idents.txt
+  oracle,mssql,sqlite_file: python reap_dbs.py db_idents.txt
 
 # thanks to https://julien.danjou.info/the-best-flake8-extensions/
 [testenv:pep8]