X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=78de300d5adf462e62ec4e644b9d870291c6ab57;hp=324f4d135eeeb812427a4c65ec5e282656377932;hb=7f200e601d03cf794c5a0504a2f69da3cf1d531a;hpb=f5bc1166430a10995e541ab263cb22634c7d9da4

diff --git a/tox.ini b/tox.ini
index 324f4d1..78de300 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 1.8
-envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,sqlite,sqlite-w32},{py27,py34}-flake8
+minversion = 2.0
+envlist = py{27,34,35,36,37}{,-sqlite},py{27,37}-flake8
 
 # Base test environment settings
 [testenv]
@@ -9,16 +9,18 @@ basepython =
     py34: {env:TOXPYTHON:python3.4}
     py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
+    py37: {env:TOXPYTHON:python3.7}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
     -rdevscripts/requirements/requirements_tests.txt
-    postgres: psycopg2
-sitepackages = True
+    postgres: psycopg2-binary
+passenv = PGPASSWORD
+platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    flake8
+    cmd
     createdb
     dropdb
 
@@ -27,8 +29,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}
@@ -42,14 +44,17 @@ commands = {[general]commands}
 [testenv:py36]
 commands = {[general]commands}
 
+[testenv:py37]
+commands = {[general]commands}
+
 # PostgreSQL test environments
 [postgresql]
 commands =
     {[testenv]commands}
-    -dropdb test
-    createdb test
-    {envpython} -m pytest --cov=sqlconvert -D postgres:///test
-    dropdb test
+    -dropdb -U postgres -w test
+    createdb -U postgres -w test
+    {envpython} -m pytest --cov=sqlconvert -D postgres://postgres:@localhost/test
+    dropdb -U postgres -w test
 
 [testenv:py27-postgres]
 commands = {[postgresql]commands}
@@ -63,13 +68,47 @@ commands = {[postgresql]commands}
 [testenv:py36-postgres]
 commands = {[postgresql]commands}
 
+[testenv:py37-postgres]
+commands = {[postgresql]commands}
+
+[postgres-w32]
+platform = win32
+commands =
+    {[testenv]commands}
+    -dropdb -U postgres -w test
+    createdb -U postgres -w test
+    pytest --cov=sqlconvert -D "postgres://postgres:Password12!@localhost/test"
+    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}
+
+[testenv:py37-postgres-w32]
+platform = win32
+commands =
+    cmd /c "copy devscripts\\CI\\validators.py {envsitepackagesdir}\\formencode\\validators.py"
+    {[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}
@@ -83,22 +122,39 @@ commands = {[sqlite]commands}
 [testenv:py36-sqlite]
 commands = {[sqlite]commands}
 
+[testenv:py37-sqlite]
+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}
 
+[testenv:py37-sqlite-w32]
+platform = win32
+commands =
+    cmd /c "copy validators.py {envsitepackagesdir}\\formencode\\validators.py"
+    {[sqlite-w32]commands}
+
 # flake8
 [testenv:py27-flake8]
 deps =
@@ -107,7 +163,7 @@ commands =
     {[testenv]commands}
     flake8
 
-[testenv:py34-flake8]
+[testenv:py37-flake8]
 deps =
     flake8
 commands =