X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=696e97cf5a3ef8ae658cf89b0405cd19bdbbf205;hp=7d25d514217d7001ada11703fea505d486d3d1f9;hb=HEAD;hpb=422cbe094f2466133002bce7bc5a295a27416f75

diff --git a/tox.ini b/tox.ini
index 7d25d51..b726b45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,101 +1,70 @@
 [tox]
-minversion = 1.8
-envlist = {py26,py27,py34,py35,py36},{py26,py27,py34,py35,py36}-{postgres,sqlite},{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]
+commands =
+    {envpython} --version
+    {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
+    {envpython} -m pytest --version
 deps =
-    sqlparse
-    pytest
-    pytest-cov
-    py26: argparse
-    py2{6,7}: SQLObject>=2.2.1
-    py3{4,5,6}: SQLObject>=3.0.0
-    m_lib>=3.1
-    m_lib.defenc>=1.0
-    postgres: psycopg2
-sitepackages = True
+    -rdevscripts/requirements/requirements_tests.txt
+    postgres: psycopg2-binary
+passenv = PGPASSWORD
+platform = linux|win32
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
-    flake8
     createdb
     dropdb
-    cmp
-    rm
 
-[general]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}]
 commands =
-    {envpython} -m pytest --cov=sqlconvert
-    mysql2sql demo/demo.sql test.out
-    cmp -s tests/mysql2sql/test.out test.out
-    rm test.out
-
-[testenv:py26]
-commands = {[general]commands}
-
-[testenv:py27]
-commands = {[general]commands}
-
-[testenv:py34]
-commands = {[general]commands}
+    {[testenv]commands}
+    {envpython} -m pytest
 
-[testenv:py35]
-commands = {[general]commands}
-
-[testenv:py36]
-commands = {[general]commands}
-
-# PostgreSQL test environments
-[postgresql]
+[testenv:py{27,34}-m2s]
 commands =
-    -dropdb test
-    createdb test
-    {envpython} -m pytest --cov=sqlconvert -D postgres:///test
-    dropdb test
-
-[testenv:py26-postgres]
-commands = {[postgresql]commands}
-
-[testenv:py27-postgres]
-commands = {[postgresql]commands}
-
-[testenv:py34-postgres]
-commands = {[postgresql]commands}
+    {[testenv]commands}
+    {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
+    cmp.py -i tests/mysql2sql/test.out2 test.out
+    rm.py -f test.out
 
-[testenv:py35-postgres]
-commands = {[postgresql]commands}
-
-[testenv:py36-postgres]
-commands = {[postgresql]commands}
-
-# SQLite test environments
-[sqlite]
+[testenv:py{35,36,37,38,39,310,311,312}-m2s]
 commands =
-    {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    rm -f /tmp/test.sqdb
-
-[testenv:py26-sqlite]
-commands = {[sqlite]commands}
+    {[testenv]commands}
+    {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
+    cmp.py -i tests/mysql2sql/test.out3 test.out
+    rm.py -f test.out
 
-[testenv:py27-sqlite]
-commands = {[sqlite]commands}
-
-[testenv:py34-sqlite]
-commands = {[sqlite]commands}
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-sqlite]
+commands =
+    {[testenv]commands}
+    -rm.py -f /tmp/test.sqdb
+    {envpython} -m pytest -D sqlite:///tmp/test.sqdb
+    rm.py -f /tmp/test.sqdb
 
-[testenv:py35-sqlite]
-commands = {[sqlite]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
 
-[testenv:py36-sqlite]
-commands = {[sqlite]commands}
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-postgres{,-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
 
 # flake8
-[testenv:py27-flake8]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-flake8]
 deps =
     flake8
-commands = flake8
-
-[testenv:py34-flake8]
-deps =
+    pytest < 7.0
+commands =
+    {[testenv]commands}
     flake8
-commands = flake8