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

diff --git a/tox.ini b/tox.ini
index 07930d6..460460d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = py{27,34,35,36}{,-sqlite},py{27,34}-flake8
+minversion = 3.15
+envlist = py27,py3{4,5,6,7,8,9}{,-sqlite},py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -9,6 +9,9 @@ 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)"
@@ -22,7 +25,8 @@ whitelist_externals =
     createdb
     dropdb
 
-[general]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}]
+platform = linux|win32
 commands =
     {[testenv]commands}
     {envpython} -m pytest --cov=sqlconvert
@@ -30,85 +34,14 @@ commands =
     cmp.py -i tests/mysql2sql/test.out test.out
     rm.py -f test.out
 
-[testenv:py27]
-commands = {[general]commands}
-
-[testenv:py34]
-commands = {[general]commands}
-
-[testenv:py35]
-commands = {[general]commands}
-
-[testenv:py36]
-commands = {[general]commands}
-
-# PostgreSQL test environments
-[postgresql]
-commands =
-    {[testenv]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}
-
-[testenv:py34-postgres]
-commands = {[postgresql]commands}
-
-[testenv:py35-postgres]
-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]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite]
 commands =
     {[testenv]commands}
     -rm.py -f /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
     rm.py -f /tmp/test.sqdb
 
-[testenv:py27-sqlite]
-commands = {[sqlite]commands}
-
-[testenv:py34-sqlite]
-commands = {[sqlite]commands}
-
-[testenv:py35-sqlite]
-commands = {[sqlite]commands}
-
-[testenv:py36-sqlite]
-commands = {[sqlite]commands}
-
-[sqlite-w32]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite-w32]
 platform = win32
 commands =
     {[testenv]commands}
@@ -116,31 +49,26 @@ commands =
     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:{py27,py34,py35,py36,py37,py38,py39}-postgres]
+commands =
+    {[testenv]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:py36-sqlite-w32]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-postgres-w32]
 platform = win32
-commands = {[sqlite-w32]commands}
-
-# flake8
-[testenv:py27-flake8]
-deps =
-    flake8
 commands =
     {[testenv]commands}
-    flake8
+    -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:py34-flake8]
+# flake8
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]
+platform = linux|win32
 deps =
     flake8
 commands =