Python 3.5, 3.6

diff --git a/docs/news.rst b/docs/news.rst
index cde3fe832b74166d31c68b97527e458744347899..a4012f0a822a5c076b51d985944e4361cb99bce8 100644 (file)
--- a/docs/news.rst
+++ b/docs/news.rst
@@ -1,6 +1,11 @@
 News
 ====
 
 News
 ====
 

+Version 0.2.0 (2017-05-??)
+--------------------------
+
+* Python 3.5, 3.6.
+

 Version 0.1.2 (2017-04-27)
 --------------------------
 
 Version 0.1.2 (2017-04-27)
 --------------------------
 

diff --git a/setup.py b/setup.py
index 3f58237ec92405dcfe931297258a0cf7a7bdbd2c..16af60fbd7ef84d3bea5b05d7f26824fda36f520 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -42,6 +42,8 @@ setup(name='sqlconvert',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.4',

+          'Programming Language :: Python :: 3.5',
+          'Programming Language :: Python :: 3.6',

       ],
       packages=['sqlconvert'],
       package_data={},
       ],
       packages=['sqlconvert'],
       package_data={},

diff --git a/tox.ini b/tox.ini
index 216f8901d5cd86257d62ed19fe43a21b10711d10..7d25d514217d7001ada11703fea505d486d3d1f9 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 minversion = 1.8
 [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]
 
 # Base test environment settings
 [testenv]


@@ -10,8 +9,8 @@ deps =
     pytest
     pytest-cov
     py26: argparse
     pytest
     pytest-cov
     py26: argparse

-    py26,py27: SQLObject>=2.2.1
-    py34: SQLObject>=3.0.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
     m_lib>=3.1
     m_lib.defenc>=1.0
     postgres: psycopg2


@@ -26,7 +25,7 @@ whitelist_externals =
 
 [general]
 commands =
 
 [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
     mysql2sql demo/demo.sql test.out
     cmp -s tests/mysql2sql/test.out test.out
     rm test.out


@@ -40,12 +39,18 @@ commands = {[general]commands}
 [testenv:py34]
 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
 # 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]
     dropdb test
 
 [testenv:py26-postgres]


@@ -57,10 +62,16 @@ commands = {[postgresql]commands}
 [testenv:py34-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 =
 # 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]
     rm -f /tmp/test.sqdb
 
 [testenv:py26-sqlite]


@@ -72,6 +83,12 @@ commands = {[sqlite]commands}
 [testenv:py34-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
 [testenv:py27-flake8]
 deps =