diff --git a/.travis.yml b/.travis.yml index 453bcdf..781e7cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ cache: - $HOME/jython python: - - '2.6' - '2.7' - '3.4' - '3.6' diff --git a/README.rst b/README.rst index c422597..0b356a2 100644 --- a/README.rst +++ b/README.rst @@ -8,7 +8,7 @@ .. image:: https://img.shields.io/coveralls/baztian/jaydebeapi/master.svg :target: https://coveralls.io/r/baztian/jaydebeapi -.. image:: https://img.shields.io/badge/python-2.6,_2.7,_3.4-blue.svg +.. image:: https://img.shields.io/badge/python-2.7,_3.4,_3.6-blue.svg :target: https://pypi.python.org/pypi/JayDeBeApi/ .. image:: https://img.shields.io/badge/jython-2.7.0-blue.svg diff --git a/tox.ini b/tox.ini index 3496e17..c6ccdd3 100644 --- a/tox.ini +++ b/tox.ini @@ -1,12 +1,11 @@ [tox] -envlist = py{26,27,3}-driver-{hsqldb,mock,sqliteXerial},py27-driver-sqlitePy,jython-driver-{hsqldb,mock} +envlist = py{27,3}-driver-{hsqldb,mock,sqliteXerial}-newjpype,py{27,3}-driver-{hsqldb,mock}-oldjpype,py27-driver-sqlitePy,jython-driver-{hsqldb,mock} [travis] 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} + 2.7: py27-driver-{hsqldb,mock,sqliteXerial,sqlitePy}-newjpype, py27-driver-{hsqldb,mock}-oldjpype + 3.4: py34-driver-{hsqldb,mock,sqliteXerial}-newjpype + 3.6: py36-driver-{hsqldb,mock,sqliteXerial}-newjpype, py36-driver-{hsqldb,mock}-oldjpype [testenv] # usedevelop required to enable coveralls source code view. @@ -19,10 +18,8 @@ setenv = driver-sqliteXerial: TESTNAME=test_integration.SqliteXerialTest driver-sqlitePy: TESTNAME=test_integration.SqlitePyTest deps = - py26: unittest2==0.5.1 - # urllib3 required by coveralls. See https://github.com/eddyxu/cpp-coveralls/issues/108 - py26: urllib3[secure] - py: JPype1==0.6.2 + oldjpype: JPype1==0.6.3 + newjpype: JPype1==0.7 jip==0.9.11 coverage commands =