From 5513c415a97d3a442d062dbefb7a97be0ffa4cbb Mon Sep 17 00:00:00 2001 From: baztian Date: Wed, 1 Apr 2015 21:03:14 +0200 Subject: [PATCH] Remove unused BACKEND. Don't run sqlite py test on py 2.6 --- .travis.yml | 18 ++++++++---------- ci/install.sh | 7 ------- 2 files changed, 8 insertions(+), 17 deletions(-) delete mode 100755 ci/install.sh diff --git a/.travis.yml b/.travis.yml index 6e06ced..06df420 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,22 +9,20 @@ python: env: matrix: - - BACKEND=unused TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT - - BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 - - BACKEND=sqlitejdbc TESTNAME=test_integration.SqliteXerialTest JDBC_DRIVER=org.xerial:sqlite-jdbc:3.7.2 - - BACKEND=sqlitepy TESTNAME=test_integration.SqlitePyTest + - TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT + - TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 + - TESTNAME=test_integration.SqliteXerialTest JDBC_DRIVER=org.xerial:sqlite-jdbc:3.7.2 matrix: - # exclude: - # - python: 2.7 - # env: BACKEND=sqlitejdbc include: - python: 2.7 - env: JYTHON=org.python:jython-installer:2.5.3 BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 + env: TESTNAME=test_integration.SqlitePyTest - python: 2.7 - env: JYTHON=org.python:jython-installer:2.7-rc1 BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 + env: JYTHON=org.python:jython-installer:2.5.3 TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 - python: 2.7 - env: JYTHON=org.python:jython-installer:2.7-rc1 BACKEND=unused TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT + env: JYTHON=org.python:jython-installer:2.7-rc1 TESTNAME=test_integration.HsqldbTest JDBC_DRIVER=org.hsqldb:hsqldb:1.8.0.10 + - python: 2.7 + env: JYTHON=org.python:jython-installer:2.7-rc1 TESTNAME=test_mock JDBC_DRIVER=org.jaydebeapi:mockdriver:1.0-SNAPSHOT before_install: - ci/before_install.sh diff --git a/ci/install.sh b/ci/install.sh deleted file mode 100755 index a1a8065..0000000 --- a/ci/install.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -set -e - -pip install jip==0.7 - -install="${TRAVIS_BUILD_DIR}/ci/install_${BACKEND}.sh" -[ -x ${install} ] && ${install} || echo "nothing to run"