X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=5502cbe402f6627cb8a8276e434ea85ff8e8c031;hb=2ab2947532f55e95db8783c77aa1a49c97c0d77b;hp=c360621c994e75fa7ea3ca15a5c4c56bd69600b8;hpb=0de3e04c1c3c8e824d799a7ba219ec50a3fccb64;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index c360621..5502cbe 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,postgres-w32,sqlite,sqlite-w32},{py27,py34}-flake8
+minversion = 2.0
+envlist = py27,py3{4,5,6,7,8,9}{,-sqlite},py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -9,17 +9,19 @@ basepython =
     py34: {env:TOXPYTHON:python3.4}
     py35: {env:TOXPYTHON:python3.5}
     py36: {env:TOXPYTHON:python3.6}
+    py37: {env:TOXPYTHON:python3.7}
+    py38: {env:TOXPYTHON:python3.8}
+    py39: {env:TOXPYTHON:python3.9}
 commands =
     {envpython} --version
     {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,19 +30,35 @@ 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]
+platform = linux|win32
 commands = {[general]commands}
 
 [testenv:py34]
+platform = linux|win32
 commands = {[general]commands}
 
 [testenv:py35]
+platform = linux|win32
 commands = {[general]commands}
 
 [testenv:py36]
+platform = linux|win32
+commands = {[general]commands}
+
+[testenv:py37]
+platform = linux|win32
+commands = {[general]commands}
+
+[testenv:py38]
+platform = linux|win32
+commands = {[general]commands}
+
+[testenv:py39]
+platform = linux|win32
 commands = {[general]commands}
 
 # PostgreSQL test environments
@@ -64,7 +82,17 @@ commands = {[postgresql]commands}
 [testenv:py36-postgres]
 commands = {[postgresql]commands}
 
+[testenv:py37-postgres]
+commands = {[postgresql]commands}
+
+[testenv:py38-postgres]
+commands = {[postgresql]commands}
+
+[testenv:py39-postgres]
+commands = {[postgresql]commands}
+
 [postgres-w32]
+platform = win32
 commands =
     {[testenv]commands}
     -dropdb -U postgres -w test
@@ -73,24 +101,43 @@ 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}
 
+[testenv:py37-postgres-w32]
+platform = win32
+commands =
+    {[postgres-w32]commands}
+
+[testenv:py38-postgres-w32]
+platform = win32
+commands =
+    {[postgres-w32]commands}
+
+[testenv:py39-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}
@@ -104,31 +151,65 @@ commands = {[sqlite]commands}
 [testenv:py36-sqlite]
 commands = {[sqlite]commands}
 
+[testenv:py37-sqlite]
+commands = {[sqlite]commands}
+
+[testenv:py38-sqlite]
+commands = {[sqlite]commands}
+
+[testenv:py39-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 =
+    {[sqlite-w32]commands}
+
+[testenv:py38-sqlite-w32]
+platform = win32
+commands =
+    {[sqlite-w32]commands}
+
+[testenv:py39-sqlite-w32]
+platform = win32
+commands =
+    {[sqlite-w32]commands}
+
 # flake8
 [testenv:py27-flake8]
+platform = linux|win32
 deps =
     flake8
 commands =
     {[testenv]commands}
     flake8
 
-[testenv:py34-flake8]
+[testenv:py39-flake8]
+platform = linux|win32
 deps =
     flake8
 commands =