X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=78de300d5adf462e62ec4e644b9d870291c6ab57;hp=324f4d135eeeb812427a4c65ec5e282656377932;hb=HEAD;hpb=f5bc1166430a10995e541ab263cb22634c7d9da4

diff --git a/tox.ini b/tox.ini
index 324f4d1..b726b45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,115 +1,70 @@
 [tox]
-minversion = 1.8
-envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,sqlite,sqlite-w32},{py27,py34}-flake8
+minversion = 3.15
+envlist = py27,py3{4,5,6,7,8,9,10,11,12}{,-m2s,-sqlite},py{27,36,312}-flake8
 
 # Base test environment settings
 [testenv]
-basepython =
-    py27: {env:TOXPYTHON:python2.7}
-    py34: {env:TOXPYTHON:python3.4}
-    py35: {env:TOXPYTHON:python3.5}
-    py36: {env:TOXPYTHON:python3.6}
 commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
+    {envpython} -m pytest --version
 deps =
     -rdevscripts/requirements/requirements_tests.txt
-    postgres: psycopg2
-sitepackages = True
+    postgres: psycopg2-binary
+passenv = PGPASSWORD
+platform = linux|win32
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    flake8
     createdb
     dropdb
 
-[general]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}]
 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
-
-[testenv:py27]
-commands = {[general]commands}
-
-[testenv:py34]
-commands = {[general]commands}
+    {envpython} -m pytest
 
-[testenv:py35]
-commands = {[general]commands}
-
-[testenv:py36]
-commands = {[general]commands}
-
-# PostgreSQL test environments
-[postgresql]
+[testenv:py{27,34}-m2s]
 commands =
     {[testenv]commands}
-    -dropdb test
-    createdb test
-    {envpython} -m pytest --cov=sqlconvert -D postgres:///test
-    dropdb 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}
+    {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
+    cmp.py -i tests/mysql2sql/test.out2 test.out
+    rm.py -f test.out
 
-# SQLite test environments
-[sqlite]
+[testenv:py{35,36,37,38,39,310,311,312}-m2s]
 commands =
     {[testenv]commands}
-    -{envpython} {envbindir}/rm.py /tmp/test.sqdb
-    {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    {envpython} {envbindir}/rm.py /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}
+    {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
+    cmp.py -i tests/mysql2sql/test.out3 test.out
+    rm.py -f test.out
 
-[sqlite-w32]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-sqlite]
 commands =
     {[testenv]commands}
-    -{envpython} {envbindir}/rm.py 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 /tmp/test.sqdb
+    {envpython} -m pytest -D sqlite:///tmp/test.sqdb
+    rm.py -f /tmp/test.sqdb
 
-[testenv:py27-sqlite-w32]
-commands = {[sqlite-w32]commands}
-
-[testenv:py34-sqlite-w32]
-commands = {[sqlite-w32]commands}
-
-[testenv:py35-sqlite-w32]
-commands = {[sqlite-w32]commands}
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-sqlite-w32]
+platform = win32
+commands =
+    {[testenv]commands}
+    -rm.py -f {env:TEMP}/test.sqdb
+    pytest -D sqlite:/{env:TEMP}/test.sqdb?debug=1
+    rm.py -f {env:TEMP}/test.sqdb
 
-# flake8
-[testenv:py27-flake8]
-deps =
-    flake8
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-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:py34-flake8]
+# flake8
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8