X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=6ba46d0f4aeb5867e4301ababbd92e175769f08f;hb=f657c7660eaa8c9878b86c2ee2849dac6fee0ca9;hp=725cae15125fae6311f0381d1ffce9606126cc8e;hpb=caee1aff6efa7adc58b77ea335bd70e24a18cf45;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index 725cae1..6ba46d0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,22 +16,23 @@ commands =
     {envpython} --version
     {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 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
 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
@@ -40,37 +41,27 @@ commands =
 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]
 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}-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
 deps =
     flake8
 commands =