From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 18 Feb 2020 16:09:43 +0000 (-0500)
Subject: Revise cx_Oracle, mysqlclient versions
X-Git-Tag: rel_1_4_0b1~502^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1fe8f432d2ceb8808c09472135e64c0a384c292;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Revise cx_Oracle, mysqlclient versions

cx_Oracle is dropping Python 2 in version 8.0
mysqlclient is dropping Python 2 in version 2.0

We are no longer testing cx_Oracle < 7 on CI so drop older
cx_Oracle versions from tox.

Change-Id: I18d8b47077d50ac02aedb6fdeb24f7c99b56aa7c
---

diff --git a/tox.ini b/tox.ini
index e1d00edd13..090d236ef5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,20 +18,22 @@ usedevelop=
 deps=pytest!=3.9.1,!=3.9.2
      pytest-xdist
      mock; python_version < '3.3'
-     # needed only for correct profiling results
-     # due to speed improvements in psycopg2 as of 2.7
+
+     # psycopg2 minimum 2.7 needed only for correct profiling results
      postgresql: psycopg2>=2.7
 
-     # needed only for correct profiling results
-     # due to speed improvements in mysqlclient as of 1.4.0
-     mysql: mysqlclient>=1.4.0
+     # mysqlclient minimum 1.4.0 needed only for correct profiling results
+     py3{,5,6,7,8,9,10,11}-mysql: mysqlclient>=1.4.0
+     py2{,7}-mysql: mysqlclient>=1.4.0,<2
+
      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
 
 whitelist_externals=sh
@@ -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
     cext: REQUIRE_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,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: IDENTS=--write-idents db_idents.txt
-    oracle,oracle6,oracle5,mssql: NOMEMORY=--nomemory
+    oracle,mssql: IDENTS=--write-idents db_idents.txt
+    oracle,mssql: NOMEMORY=--nomemory
     backendonly: BACKENDONLY=--backend-only
 
 # tox as of 2.0 blocks all environment variables from the
@@ -79,7 +81,7 @@ commands=
   cext: /bin/true
   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: python reap_dbs.py db_idents.txt
+  oracle,mssql: python reap_dbs.py db_idents.txt
 
 # thanks to https://julien.danjou.info/the-best-flake8-extensions/
 [testenv:pep8]