X-Git-Url: https://git.phdru.name/?p=sqlconvert.git;a=blobdiff_plain;f=tox.ini;h=6feee24747adef5a717568e83515b915da9e0c3f;hp=229abb742cedf5ebbcbbbee593473f032cd4f797;hb=7d6c89bbfba4554ffe68dd8da0e6fed5961aa128;hpb=d2badb1547aaf53057acbd9b02b81e1dc385f8ec

diff --git a/tox.ini b/tox.ini
index 229abb7..6feee24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,19 @@
 [tox]
 minversion = 1.8
-toxworkdir={homedir}/.tox/sqlconvert
-envlist = {py26,py27,py34},{py26,py27,py34}-{postgres,sqlite},{py27,py34}-flake8
+envlist = {py27,py34,py35,py36},{py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-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}
+commands =
+    {envpython} --version
+    {envpython} -c "import struct; print(struct.calcsize('P') * 8)"
 deps =
-    sqlparse
-    pytest
-    pytest-cov
-    py26: argparse
-    py26,py27: SQLObject>=2.2.1
-    py34: SQLObject>=3.0.0
-    py26,py27: m_lib>=2.0
-    py34: m_lib>=3.0
+    -rdevscripts/requirements/requirements_tests.txt
     postgres: psycopg2
 sitepackages = True
 # Don't fail or warn on uninstalled commands
@@ -21,18 +21,14 @@ whitelist_externals =
     flake8
     createdb
     dropdb
-    cmp
-    rm
 
 [general]
 commands =
-    python -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]commands}
+    {envpython} -m pytest --cov=sqlconvert
+    {envpython} {envbindir}/mysql2sql -P demo/demo.sql test.out
+    {envpython} {envbindir}/cmp.py -i tests/mysql2sql/test.out test.out
+    {envpython} {envbindir}/rm.py test.out
 
 [testenv:py27]
 commands = {[general]commands}
@@ -40,31 +36,40 @@ commands = {[general]commands}
 [testenv:py34]
 commands = {[general]commands}
 
+[testenv:py35]
+commands = {[general]commands}
+
+[testenv:py36]
+commands = {[general]commands}
+
 # PostgreSQL test environments
 [postgresql]
 commands =
+    {[testenv]commands}
     -dropdb test
     createdb test
-    python -m pytest --cov=sqlconvert -D postgres:///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]
 commands =
-    python -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
-    rm -f /tmp/test.sqdb
-
-[testenv:py26-sqlite]
-commands = {[sqlite]commands}
+    {[testenv]commands}
+    -{envpython} {envbindir}/rm.py /tmp/test.sqdb
+    {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
+    {envpython} {envbindir}/rm.py /tmp/test.sqdb
 
 [testenv:py27-sqlite]
 commands = {[sqlite]commands}
@@ -72,13 +77,23 @@ commands = {[sqlite]commands}
 [testenv:py34-sqlite]
 commands = {[sqlite]commands}
 
+[testenv:py35-sqlite]
+commands = {[sqlite]commands}
+
+[testenv:py36-sqlite]
+commands = {[sqlite]commands}
+
 # flake8
 [testenv:py27-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8
+commands =
+    {[testenv]commands}
+    flake8