From 4ef125e6b1e26400c06f8017c415bd5538179355 Mon Sep 17 00:00:00 2001 From: baztian Date: Fri, 10 Mar 2017 09:59:23 +0100 Subject: [PATCH] Introduce Python 3.6 to the build matrix. --- .travis.yml | 3 ++- tox.ini | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5786242..e3ed5fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,12 @@ python: - '2.6' - '2.7' - '3.4' + - '3.6' env: matrix: include: - - python: 3.4 + - python: 3.6 env: JYTHON=org.python:jython-installer:2.7.0 TOXENV="jython-driver-{hsqldb,mock}" before_install: diff --git a/tox.ini b/tox.ini index b154357..b7773c6 100644 --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ python = 2.6: py26-driver-{hsqldb,mock,sqliteXerial} 2.7: py27-driver-{hsqldb,mock,sqliteXerial,sqlitePy} 3.4: py34-driver-{hsqldb,mock,sqliteXerial} + 3.6: py36-driver-{hsqldb,mock,sqliteXerial} [testenv] whitelist_externals = mvn @@ -16,10 +17,11 @@ setenv = driver-sqliteXerial: TESTNAME=test_integration.SqliteXerialTest driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest deps = - py: JPype1==0.6.2 py26: unittest2==0.5.1 + py: JPype1==0.6.2 jip==0.9.10 commands = + python --version python ci/jipconf_subst.py {envdir} {toxworkdir}/shared driver-hsqldb: jip install org.hsqldb:hsqldb:1.8.0.10 driver-sqliteXerial: jip install org.xerial:sqlite-jdbc:3.7.2