Tests: Install psycopg2 from psycopg2-binary package

[sqlconvert.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index c360621c994e75fa7ea3ca15a5c4c56bd69600b8..07930d6fd50362b96a1f35c68a1e8ac34a37969b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 1.8
-envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,postgres-w32,sqlite,sqlite-w32},{py27,py34}-flake8
+minversion = 2.0
+envlist = py{27,34,35,36}{,-sqlite},py{27,34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -14,12 +14,11 @@ commands =
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
     -rdevscripts/requirements/requirements_tests.txt
-    postgres: psycopg2
+    postgres: psycopg2-binary
 passenv = PGPASSWORD
-sitepackages = True
+platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    flake8
     createdb
     dropdb
 
@@ -28,8 +27,8 @@ 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 +64,7 @@ commands = {[postgresql]commands}
 commands = {[postgresql]commands}
 
 [postgres-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -dropdb -U postgres -w test
@@ -73,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}
-    -{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 +109,27 @@ 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}
+
+[testenv:py36-sqlite-w32]
+platform = win32
 commands = {[sqlite-w32]commands}
 
 # flake8