X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=6865f49aca4b1ffd00cbdded797124f8f011c7b4;hp=a91d13e4f42404ab1a6c7330d69995514e0cea7e;hb=3c116e688b49551074ceda6db695bb7cc44ba9c3;hpb=b1c1e23425137b19ea790c6dba792e48011151b1

diff --git a/tox.ini b/tox.ini
index a91d13e..6865f49 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 = {py27,py34,py35,py36}{,-sqlite},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -16,12 +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
 
@@ -67,6 +66,7 @@ commands = {[postgresql]commands}
 commands = {[postgresql]commands}
 
 [postgres-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -dropdb -U postgres -w test
@@ -75,15 +75,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
@@ -107,6 +111,7 @@ commands = {[sqlite]commands}
 commands = {[sqlite]commands}
 
 [sqlite-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -rm.py -f C:/projects/sqlconvert/test.sqdb
@@ -114,12 +119,15 @@ 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}
 
 # flake8