Python 3.5, 3.6

[sqlconvert.git] / tox.ini

diff --git a/tox.ini b/tox.ini
index 0dfe51a56f82c3be608e66955c810f8b71b1f117..7d25d514217d7001ada11703fea505d486d3d1f9 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 minversion = 1.8
-toxworkdir={homedir}/.tox/sqlconvert
-envlist = {py26,py27,py34},{py26,py27,py34}-{postgres,sqlite},{py27,py34}-flake8
+envlist = {py26,py27,py34,py35,py36},{py26,py27,py34,py35,py36}-{postgres,sqlite},{py27,py34}-flake8
 
 # Base test environment settings
 [testenv]
@@ -10,10 +9,10 @@ deps =
     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
+    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
 # Don't fail or warn on uninstalled commands
@@ -21,11 +20,15 @@ whitelist_externals =
     flake8
     createdb
     dropdb
+    cmp
     rm
 
 [general]
 commands =
-    python -m pytest --cov=sqlconvert
+    {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}
@@ -36,12 +39,18 @@ commands = {[general]commands}
 [testenv:py34]
 commands = {[general]commands}
 
+[testenv:py35]
+commands = {[general]commands}
+
+[testenv:py36]
+commands = {[general]commands}
+
 # PostgreSQL test environments
 [postgresql]
 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]
@@ -53,10 +62,16 @@ 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
+    {envpython} -m pytest --cov=sqlconvert -D sqlite:///tmp/test.sqdb
     rm -f /tmp/test.sqdb
 
 [testenv:py26-sqlite]
@@ -68,6 +83,12 @@ 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 =