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

diff --git a/tox.ini b/tox.ini
index 5502cbe..13c53c4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
-minversion = 2.0
-envlist = py27,py3{4,5,6,7,8,9}{,-sqlite},py{27,39}-flake8
+minversion = 3.15
+envlist = py27,py3{4,5,6,7,8,9,10}{,-sqlite},py{27,39}-flake8
 
 # Base test environment settings
 [testenv]
@@ -12,206 +12,57 @@ basepython =
     py37: {env:TOXPYTHON:python3.7}
     py38: {env:TOXPYTHON:python3.8}
     py39: {env:TOXPYTHON:python3.9}
+    py310: {env:TOXPYTHON:python3.10}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
+    {envpython} -m pytest --version
 deps =
     -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2-binary
 passenv = PGPASSWORD
-platform = linux
+platform = linux|win32
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
     createdb
     dropdb
 
-[general]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}]
 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]
-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
-[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}
-
-[testenv:py39-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 =
-    {[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]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-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}
-
-[testenv:py39-sqlite]
-commands = {[sqlite]commands}
-
-[sqlite-w32]
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-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}
-
-[testenv:py37-sqlite-w32]
-platform = win32
-commands =
-    {[sqlite-w32]commands}
+    -rm.py -f {env:TEMP}/test.sqdb
+    pytest -D sqlite:/{env:TEMP}/test.sqdb?debug=1
+    rm.py -f {env:TEMP}/test.sqdb
 
-[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
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-postgres{,-w32}]
 commands =
     {[testenv]commands}
-    flake8
+    -dropdb --username=runner test
+    createdb --username=runner test
+    {envpython} -m pytest -D postgres://runner:test@localhost/test
+    dropdb --username=runner test
 
-[testenv:py39-flake8]
-platform = linux|win32
+# flake8
+[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8