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

diff --git a/tox.ini b/tox.ini
index eb6b355..07930d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 1.8
-envlist = {py26,py27,py34,py35,py36},{py26,py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-flake8
+minversion = 2.0
+envlist = py{27,34,35,36}{,-sqlite},py{27,34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -13,19 +13,12 @@ commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    sqlparse
-    pytest
-    pytest-cov
-    py26: argparse
-    py2{6,7}: SQLObject>=2.2.1
-    py3{4,5,6}: SQLObject>=3.0.0
-    m_lib>=3.1
-    m_lib.defenc>=1.0
-    postgres: psycopg2
-sitepackages = True
+    -rdevscripts/requirements/requirements_tests.txt
+    postgres: psycopg2-binary
+passenv = PGPASSWORD
+platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    flake8
     createdb
     dropdb
 
@@ -34,11 +27,8 @@ commands =
     {[testenv]commands}
     {envpython} -m pytest --cov=sqlconvert
     {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
-    {envpython} devscripts/cmp.py -i tests/mysql2sql/test.out test.out
-    {envpython} devscripts/rm.py test.out
-
-[testenv:py26]
-commands = {[general]commands}
+    cmp.py -i tests/mysql2sql/test.out test.out
+    rm.py -f test.out
 
 [testenv:py27]
 commands = {[general]commands}
@@ -56,13 +46,10 @@ commands = {[general]commands}
 [postgresql]
 commands =
     {[testenv]commands}
-    -dropdb test
-    createdb test
-    {envpython} -m pytest --cov=sqlconvert -D postgres:///test
-    dropdb test
-
-[testenv:py26-postgres]
-commands = {[postgresql]commands}
+    -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}
@@ -76,15 +63,38 @@ commands = {[postgresql]commands}
 [testenv:py36-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}
+
 # SQLite test environments
 [sqlite]
 commands =
     {[testenv]commands}
+    -rm.py -f /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    {envpython} devscripts/rm.py /tmp/test.sqdb
-
-[testenv:py26-sqlite]
-commands = {[sqlite]commands}
+    rm.py -f /tmp/test.sqdb
 
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}
@@ -98,6 +108,30 @@ commands = {[sqlite]commands}
 [testenv:py36-sqlite]
 commands = {[sqlite]commands}
 
+[sqlite-w32]
+platform = win32
+commands =
+    {[testenv]commands}
+    -rm.py -f C:/projects/sqlconvert/test.sqdb
+    pytest --cov=sqlconvert -D sqlite:/C:/projects/sqlconvert/test.sqdb?debug=1
+    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
 [testenv:py27-flake8]
 deps =