X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tox.ini;h=376fae5ab86b8521e458a7fe7780d3c25e6b6178;hb=9f20981eecb43833c38fe20ece52d1a3130f94d7;hp=460460d07604aa9ada9706c009fd6773ccfbf53e;hpb=a8e11c9a8b06bb91000fd6825c7f9c7c9e9db235;p=sqlconvert.git

diff --git a/tox.ini b/tox.ini
index 460460d..376fae5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,9 +16,13 @@ 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
 # Don't fail or warn on uninstalled commands
 whitelist_externals =
@@ -52,19 +56,19 @@ commands =
 [testenv:{py27,py34,py35,py36,py37,py38,py39}-postgres]
 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
+    -dropdb --username=runner test
+    createdb --username=runner test
+    {envpython} -m pytest --cov=sqlconvert -D postgres://runner:test@localhost/test
+    dropdb --username=runner 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
+    -dropdb --username=postgres --no-password test
+    createdb --username=postgres --no-password test
     pytest --cov=sqlconvert -D "postgres://postgres:Password12!@localhost/test"
-    dropdb -U postgres -w test
+    dropdb --username=postgres --no-password test
 
 # flake8
 [testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]