X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=6175f62938254f85202a5287040a8a3fc2e5aa3f;hp=423f411688ddd7c7ef30f6b90acdc1dfd17b777f;hb=a85986b0ed9fd40f6e294deb87ae6189dfdf0c49;hpb=0c816b604efecb8964719bdbad1975231f7e3ee2

diff --git a/tox.ini b/tox.ini
index 423f411..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,13 +16,11 @@ deps =
     -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2
 passenv = PGPASSWORD
+platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     createdb
     dropdb
-    flake8
-    cmp.py
-    rm.py
 
 [general]
 commands =
@@ -66,6 +64,7 @@ commands = {[postgresql]commands}
 commands = {[postgresql]commands}
 
 [postgres-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -dropdb -U postgres -w test
@@ -74,15 +73,19 @@ 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
@@ -106,6 +109,7 @@ commands = {[sqlite]commands}
 commands = {[sqlite]commands}
 
 [sqlite-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -rm.py -f C:/projects/sqlconvert/test.sqdb
@@ -113,12 +117,19 @@ commands =
     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