X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=a185a37bef77eb9213da845d999cee7809b770c2;hp=925ad726e12a929753e84dc1e943ae590ab2247b;hb=HEAD;hpb=38fd71112379459e7c2e239538f16e0a60e37c46

diff --git a/tox.ini b/tox.ini
index 925ad72..b726b45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,13 @@
 [tox]
 minversion = 3.15
-envlist = py27,py3{4,5,6,7,8,9,10}{,-sqlite},py{27,39}-flake8
+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}
-    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
@@ -26,22 +18,33 @@ whitelist_externals =
     createdb
     dropdb
 
-[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}]
 commands =
     {[testenv]commands}
     {envpython} -m pytest
+
+[testenv:py{27,34}-m2s]
+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:py{35,36,37,38,39,310,311,312}-m2s]
+commands =
+    {[testenv]commands}
     {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
-    cmp.py -i tests/mysql2sql/test.out test.out
+    cmp.py -i tests/mysql2sql/test.out3 test.out
     rm.py -f test.out
 
-[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-sqlite]
+[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:{py27,py34,py35,py36,py37,py38,py39,py310}-sqlite-w32]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-sqlite-w32]
 platform = win32
 commands =
     {[testenv]commands}
@@ -49,7 +52,7 @@ commands =
     pytest -D sqlite:/{env:TEMP}/test.sqdb?debug=1
     rm.py -f {env:TEMP}/test.sqdb
 
-[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-postgres{,-w32}]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-postgres{,-w32}]
 commands =
     {[testenv]commands}
     -dropdb --username=runner test
@@ -58,9 +61,10 @@ commands =
     dropdb --username=runner test
 
 # flake8
-[testenv:{py27,py34,py35,py36,py37,py38,py39,py310}-flake8]
+[testenv:py{27,34,35,36,37,38,39,310,311,312}-flake8]
 deps =
     flake8
+    pytest < 7.0
 commands =
     {[testenv]commands}
     flake8