X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=07930d6fd50362b96a1f35c68a1e8ac34a37969b;hp=6865f49aca4b1ffd00cbdded797124f8f011c7b4;hb=adda05105f4c40015d4a9480a5bd562e80986e57;hpb=2f25f8e1006169109b0122120efc3bc68382cb6c

diff --git a/tox.ini b/tox.ini
index 6865f49..07930d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = {py27,py34,py35,py36}{,-sqlite},{py27,py34}-flake8
+envlist = py{27,34,35,36}{,-sqlite},py{27,34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -14,15 +14,13 @@ commands =
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
     -rdevscripts/requirements/requirements_tests.txt
-    postgres: psycopg2
+    postgres: psycopg2-binary
 passenv = PGPASSWORD
 platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     createdb
     dropdb
-    cmp.py
-    rm.py
 
 [general]
 commands =
@@ -130,6 +128,10 @@ commands = {[sqlite-w32]commands}
 platform = win32
 commands = {[sqlite-w32]commands}
 
+[testenv:py36-sqlite-w32]
+platform = win32
+commands = {[sqlite-w32]commands}
+
 # flake8
 [testenv:py27-flake8]
 deps =