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

diff --git a/tox.ini b/tox.ini
index 8fb179e..6feee24 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,19 @@
 [tox]
 minversion = 1.8
-envlist = {py26,py27,py34},{py26,py27,py34}-postgres,{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
@@ -23,11 +24,11 @@ whitelist_externals =
 
 [general]
 commands =
-    python -m pytest --cov=sqlconvert
-    rm -f *.tmp
-
-[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}
@@ -35,16 +36,20 @@ 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 -D postgres:///test
+    {envpython} -m pytest --cov=sqlconvert -D postgres:///test
     dropdb test
-    rm -f *.tmp
-
-[testenv:py26-postgres]
-commands = {[postgresql]commands}
 
 [testenv:py27-postgres]
 commands = {[postgresql]commands}
@@ -52,12 +57,43 @@ 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 =
+    {[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}
+
+[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 demo scripts sqlconvert tests
+commands =
+    {[testenv]commands}
+    flake8
 
 [testenv:py34-flake8]
 deps =
     flake8
-commands = flake8 demo scripts sqlconvert tests
+commands =
+    {[testenv]commands}
+    flake8