X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=3d9cf96fda05e1364c0a730c4dac11f2f2f92629;hb=b0f95423ec9f1a4d1afa5e959df9e50bebae8d71;hp=150c8b79dceae165a8ef8ff275788d5636bc3995;hpb=96ec2fdc1e551d98d78ec9bd3aa8ef997063dc4b;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index 150c8b7..3d9cf96 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = py27,py3{4,5,6,7,8}{,-sqlite},py{27,38}-flake8
+minversion = 3.15
+envlist = py27,py3{4,5,6,7,8,9}{,-sqlite},py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -11,179 +11,68 @@ basepython =
     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 =
+    pip < 19.2
+    setuptools < 44
     -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2-binary
 passenv = PGPASSWORD
+setenv =
+    VIRTUALENV_PIP = 19.1.1
 platform = linux
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    cmd
     createdb
     dropdb
 
-[general]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}]
+platform = linux|win32
 commands =
     {[testenv]commands}
-    {envpython} -m pytest --cov=sqlconvert
+    {envpython} -m pytest
     {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
     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}
-
-[testenv:py37]
-commands = {[general]commands}
-
-[testenv:py38]
-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}
-
-[testenv:py37-postgres]
-commands = {[postgresql]commands}
-
-[testenv:py38-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}
-
-[testenv:py38-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
+    {envpython} -m pytest -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}
-
-[testenv:py37-sqlite]
-commands = {[sqlite]commands}
-
-[testenv:py38-sqlite]
-commands = {[sqlite]commands}
-
-[sqlite-w32]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-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
+    pytest -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}
-
-[testenv:py37-sqlite-w32]
-platform = win32
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-postgres]
 commands =
-    cmd /c "copy validators.py {envsitepackagesdir}\\formencode\\validators.py"
-    {[sqlite-w32]commands}
+    {[testenv]commands}
+    -dropdb --username=runner test
+    createdb --username=runner test
+    {envpython} -m pytest -D postgres://runner:test@localhost/test
+    dropdb --username=runner test
 
-[testenv:py38-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 --username=postgres --no-password test
+    createdb --username=postgres --no-password test
+    pytest -D "postgres://postgres:Password12!@localhost/test"
+    dropdb --username=postgres --no-password test
 
-[testenv:py38-flake8]
+# flake8
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]
+platform = linux|win32
 deps =
     flake8
 commands =