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

diff --git a/tox.ini b/tox.ini
index 7d25d51..c318bdb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,101 +1,80 @@
 [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}{,-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)"
 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
+    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 =
-    flake8
     createdb
     dropdb
-    cmp
-    rm
 
-[general]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}]
+platform = linux|win32
 commands =
+    {[testenv]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:py35]
-commands = {[general]commands}
+    {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
+    cmp.py -i tests/mysql2sql/test.out test.out
+    rm.py -f test.out
 
-[testenv:py36]
-commands = {[general]commands}
-
-# PostgreSQL test environments
-[postgresql]
-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:py35-postgres]
-commands = {[postgresql]commands}
-
-[testenv:py36-postgres]
-commands = {[postgresql]commands}
-
-# SQLite test environments
-[sqlite]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite]
 commands =
+    {[testenv]commands}
+    -rm.py -f /tmp/test.sqdb
     {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    rm -f /tmp/test.sqdb
-
-[testenv:py26-sqlite]
-commands = {[sqlite]commands}
+    rm.py -f /tmp/test.sqdb
 
-[testenv:py27-sqlite]
-commands = {[sqlite]commands}
-
-[testenv:py34-sqlite]
-commands = {[sqlite]commands}
-
-[testenv:py35-sqlite]
-commands = {[sqlite]commands}
+[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
 
-[testenv:py36-sqlite]
-commands = {[sqlite]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
+
+[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
 
 # flake8
-[testenv:py27-flake8]
+[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8]
+platform = linux|win32
 deps =
     flake8
-commands = flake8
-
-[testenv:py34-flake8]
-deps =
+commands =
+    {[testenv]commands}
     flake8
-commands = flake8