Build: Require tox >= 2.0 (for passenv)

[sqlconvert.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index c360621c994e75fa7ea3ca15a5c4c56bd69600b8..99be0f35a19baea753e0b3891e43a091fd111da1 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-minversion = 1.8
+minversion = 2.0
 envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,postgres-w32,sqlite,sqlite-w32},{py27,py34}-flake8
 
 # Base test environment settings
@@ -19,17 +19,19 @@ passenv = PGPASSWORD
 sitepackages = True
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    flake8
     createdb
     dropdb
+    flake8
+    cmp.py
+    rm.py
 
 [general]
 commands =
     {[testenv]commands}
     {envpython} -m pytest --cov=sqlconvert
     {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
-    {envpython} {envbindir}/cmp.py -i tests/mysql2sql/test.out test.out
-    {envpython} {envbindir}/rm.py test.out
+    cmp.py -i tests/mysql2sql/test.out test.out
+    rm.py test.out
 
 [testenv:py27]
 commands = {[general]commands}
@@ -88,9 +90,9 @@ commands = {[postgres-w32]commands}
 [sqlite]
 commands =
     {[testenv]commands}
-    -{envpython} {envbindir}/rm.py /tmp/test.sqdb
+    -rm.py /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    {envpython} {envbindir}/rm.py /tmp/test.sqdb
+    rm.py /tmp/test.sqdb
 
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}
@@ -107,9 +109,9 @@ commands = {[sqlite]commands}
 [sqlite-w32]
 commands =
     {[testenv]commands}
-    -{envpython} {envbindir}/rm.py C:/projects/sqlconvert/test.sqdb
+    -rm.py C:/projects/sqlconvert/test.sqdb
     pytest --cov=sqlconvert -D sqlite:/C:/projects/sqlconvert/test.sqdb?debug=1
-    {envpython} {envbindir}/rm.py C:/projects/sqlconvert/test.sqdb
+    rm.py C:/projects/sqlconvert/test.sqdb
 
 [testenv:py27-sqlite-w32]
 commands = {[sqlite-w32]commands}