Merge "Use python version in extras_require; integrate with tox"

2 files changed, 11 insertions, 15 deletions

diff --git a/setup.cfg b/setup.cfg
index 3d45ca6b0..508e3444a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -39,8 +39,12 @@ package_dir =
 mssql = pyodbc
 mssql_pymssql = pymssql
 mssql_pyodbc = pyodbc
-mysql = mysqlclient
-oracle = cx_oracle
+mysql =
+    mysqlclient>=1.4.0,<2;python_version<"3"
+    mysqlclient>=1.4.0;python_version>="3"
+oracle =
+    cx_oracle>=7,<8;python_version<"3"
+    cx_oracle>=7;python_version>="3"
 postgresql = psycopg2>=2.7
 postgresql_pg8000 = pg8000
 postgresql_psycopg2binary = psycopg2-binary
diff --git a/tox.ini b/tox.ini
index 8204d0b55..460f191cf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,19 +19,11 @@ deps=pytest!=3.9.1,!=3.9.2
      pytest-xdist
      mock; python_version < '3.3'
 
-     postgresql: psycopg2>=2.7
-
-     # 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
-
-     py3{,5,6,7,8,9,10,11}-oracle: cx_oracle>=7.0
-     py2{,7}-oracle: cx_oracle>=7.0,<8
-
-     mssql: pyodbc
+     postgresql: .[postgresql]
+     mysql: .[mysql]
+     mysql: .[pymysql]
+     oracle: .[oracle]
+     mssql: .[mssql]
 
      cov: pytest-cov