X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=5897033dc7fc48a2352e3abf1a6206485bf3ab68;hb=384eb1bae27664921eca6659c96f2d18663cadf5;hp=c360621c994e75fa7ea3ca15a5c4c56bd69600b8;hpb=0de3e04c1c3c8e824d799a7ba219ec50a3fccb64;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index c360621..5897033 100644
--- 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
@@ -16,20 +16,21 @@ deps =
     -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2
 passenv = PGPASSWORD
-sitepackages = True
+platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    flake8
     createdb
     dropdb
+    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 -f test.out
 
 [testenv:py27]
 commands = {[general]commands}
@@ -65,6 +66,7 @@ commands = {[postgresql]commands}
 commands = {[postgresql]commands}
 
 [postgres-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -dropdb -U postgres -w test
@@ -73,24 +75,28 @@ commands =
     dropdb -U postgres -w test
 
 [testenv:py27-postgres-w32]
+platform = win32
 commands = {[postgres-w32]commands}
 
 [testenv:py34-postgres-w32]
+platform = win32
 commands = {[postgres-w32]commands}
 
 [testenv:py35-postgres-w32]
+platform = win32
 commands = {[postgres-w32]commands}
 
 [testenv:py36-postgres-w32]
+platform = win32
 commands = {[postgres-w32]commands}
 
 # SQLite test environments
 [sqlite]
 commands =
     {[testenv]commands}
-    -{envpython} {envbindir}/rm.py /tmp/test.sqdb
+    -rm.py -f /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    {envpython} {envbindir}/rm.py /tmp/test.sqdb
+    rm.py -f /tmp/test.sqdb
 
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}
@@ -105,19 +111,23 @@ commands = {[sqlite]commands}
 commands = {[sqlite]commands}
 
 [sqlite-w32]
+platform = win32
 commands =
     {[testenv]commands}
-    -{envpython} {envbindir}/rm.py C:/projects/sqlconvert/test.sqdb
+    -rm.py -f 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 -f C:/projects/sqlconvert/test.sqdb
 
 [testenv:py27-sqlite-w32]
+platform = win32
 commands = {[sqlite-w32]commands}
 
 [testenv:py34-sqlite-w32]
+platform = win32
 commands = {[sqlite-w32]commands}
 
 [testenv:py35-sqlite-w32]
+platform = win32
 commands = {[sqlite-w32]commands}
 
 # flake8