X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=e9b04fc218fc55df9590c703b6f6620281fcc5a2;hb=16b87d7760e72ea2969447c0f5bc02bf38b6b77b;hp=c318bdb3732af16be2514f48599877b750666285;hpb=ddc99f20f37b8e78f7e6aa3361d166a2631d316f;p=sqlconvert.git

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