X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=6175f62938254f85202a5287040a8a3fc2e5aa3f;hp=99be0f35a19baea753e0b3891e43a091fd111da1;hb=60812e1b7c7a2d993374bfd0909f7f4cd00e8f69;hpb=be69bd9092188061ca58f1d18fde033ce2641485

diff --git a/tox.ini b/tox.ini
index 99be0f3..6175f62 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,postgres-w32,sqlite,sqlite-w32},{py27,py34}-flake8
+envlist = py{27,34,35,36}{,-sqlite},py{27,34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -16,14 +16,11 @@ deps =
     -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2
 passenv = PGPASSWORD
-sitepackages = True
+platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     createdb
     dropdb
-    flake8
-    cmp.py
-    rm.py
 
 [general]
 commands =
@@ -31,7 +28,7 @@ commands =
     {envpython} -m pytest --cov=sqlconvert
     {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
     cmp.py -i tests/mysql2sql/test.out test.out
-    rm.py test.out
+    rm.py -f test.out
 
 [testenv:py27]
 commands = {[general]commands}
@@ -67,6 +64,7 @@ commands = {[postgresql]commands}
 commands = {[postgresql]commands}
 
 [postgres-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -dropdb -U postgres -w test
@@ -75,24 +73,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}
-    -rm.py /tmp/test.sqdb
+    -rm.py -f /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    rm.py /tmp/test.sqdb
+    rm.py -f /tmp/test.sqdb
 
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}
@@ -107,19 +109,27 @@ commands = {[sqlite]commands}
 commands = {[sqlite]commands}
 
 [sqlite-w32]
+platform = win32
 commands =
     {[testenv]commands}
-    -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
-    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}
+
+[testenv:py36-sqlite-w32]
+platform = win32
 commands = {[sqlite-w32]commands}
 
 # flake8