From a8e11c9a8b06bb91000fd6825c7f9c7c9e9db235 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 16 Jan 2021 00:27:36 +0300 Subject: [PATCH] Test(tox): Refactor `tox.ini`: combine environments --- tox.ini | 175 ++++++-------------------------------------------------- 1 file changed, 17 insertions(+), 158 deletions(-) diff --git a/tox.ini b/tox.ini index 8a4b1e6..460460d 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,8 @@ whitelist_externals = createdb dropdb -[general] +[testenv:{py27,py34,py35,py36,py37,py38,py39}] +platform = linux|win32 commands = {[testenv]commands} {envpython} -m pytest --cov=sqlconvert @@ -33,134 +34,14 @@ commands = cmp.py -i tests/mysql2sql/test.out test.out rm.py -f test.out -[testenv:py27] -platform = linux|win32 -commands = {[general]commands} - -[testenv:py34] -platform = linux|win32 -commands = {[general]commands} - -[testenv:py35] -platform = linux|win32 -commands = {[general]commands} - -[testenv:py36] -platform = linux|win32 -commands = {[general]commands} - -[testenv:py37] -platform = linux|win32 -commands = {[general]commands} - -[testenv:py38] -platform = linux|win32 -commands = {[general]commands} - -[testenv:py39] -platform = linux|win32 -commands = {[general]commands} - -# PostgreSQL test environments -[postgresql] -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-postgres] -commands = {[postgresql]commands} - -[testenv:py34-postgres] -commands = {[postgresql]commands} - -[testenv:py35-postgres] -commands = {[postgresql]commands} - -[testenv:py36-postgres] -commands = {[postgresql]commands} - -[testenv:py37-postgres] -commands = {[postgresql]commands} - -[testenv:py38-postgres] -commands = {[postgresql]commands} - -[testenv:py39-postgres] -commands = {[postgresql]commands} - -[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 - -[testenv:py27-postgres-w32] -platform = win32 -commands = {[postgres-w32]commands} - -[testenv:py34-postgres-w32] -platform = win32 -commands = {[postgres-w32]commands} - -[testenv:py35-postgres-w32] -platform = win32 -commands = {[postgres-w32]commands} - -[testenv:py36-postgres-w32] -platform = win32 -commands = {[postgres-w32]commands} - -[testenv:py37-postgres-w32] -platform = win32 -commands = - {[postgres-w32]commands} - -[testenv:py38-postgres-w32] -platform = win32 -commands = - {[postgres-w32]commands} - -[testenv:py39-postgres-w32] -platform = win32 -commands = - {[postgres-w32]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.py -f /tmp/test.sqdb -[testenv:py27-sqlite] -commands = {[sqlite]commands} - -[testenv:py34-sqlite] -commands = {[sqlite]commands} - -[testenv:py35-sqlite] -commands = {[sqlite]commands} - -[testenv:py36-sqlite] -commands = {[sqlite]commands} - -[testenv:py37-sqlite] -commands = {[sqlite]commands} - -[testenv:py38-sqlite] -commands = {[sqlite]commands} - -[testenv:py39-sqlite] -commands = {[sqlite]commands} - -[sqlite-w32] +[testenv:{py27,py34,py35,py36,py37,py38,py39}-sqlite-w32] platform = win32 commands = {[testenv]commands} @@ -168,47 +49,25 @@ commands = pytest --cov=sqlconvert -D sqlite:/C:/projects/sqlconvert/test.sqdb?debug=1 rm.py -f C:/projects/sqlconvert/test.sqdb -[testenv:py27-sqlite-w32] -platform = win32 -commands = {[sqlite-w32]commands} - -[testenv:py34-sqlite-w32] -platform = win32 -commands = {[sqlite-w32]commands} - -[testenv:py35-sqlite-w32] -platform = win32 -commands = {[sqlite-w32]commands} - -[testenv:py36-sqlite-w32] -platform = win32 -commands = {[sqlite-w32]commands} - -[testenv:py37-sqlite-w32] -platform = win32 -commands = - {[sqlite-w32]commands} - -[testenv:py38-sqlite-w32] -platform = win32 +[testenv:{py27,py34,py35,py36,py37,py38,py39}-postgres] commands = - {[sqlite-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:py39-sqlite-w32] +[testenv:{py27,py34,py35,py36,py37,py38,py39}-postgres-w32] platform = win32 -commands = - {[sqlite-w32]commands} - -# flake8 -[testenv:py27-flake8] -platform = linux|win32 -deps = - flake8 commands = {[testenv]commands} - flake8 + -dropdb -U postgres -w test + createdb -U postgres -w test + pytest --cov=sqlconvert -D "postgres://postgres:Password12!@localhost/test" + dropdb -U postgres -w test -[testenv:py39-flake8] +# flake8 +[testenv:{py27,py34,py35,py36,py37,py38,py39}-flake8] platform = linux|win32 deps = flake8 -- 2.39.2