From 919d048444cb94510861c64be51f9dec4fc34c05 Mon Sep 17 00:00:00 2001 From: baztian Date: Tue, 11 Feb 2014 16:21:38 +0100 Subject: [PATCH] Put Travis before_install into separate script. --- .travis.yml | 5 ++--- ci/before_install.sh | 7 +++++++ requirements.txt | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100755 ci/before_install.sh diff --git a/.travis.yml b/.travis.yml index cf3ba16..8e559d9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,11 @@ matrix: env: PYTHON_IMPL=jython_2_5_3 BACKEND=hsqldb before_install: - - echo $TRAVIS_PYTHON_VERSION $PYTHON_IMPL $BACKEND - - sudo apt-get update -qq - - sudo apt-get install -qq openjdk-7-jdk openjdk-7-jre + - ci/before_install.sh install: - pip install -r requirements.txt + - pip install -e . - jip install org.xerial:sqlite-jdbc:3.7.2 - jip install org.hsqldb:hsqldb:1.8.0.10 diff --git a/ci/before_install.sh b/ci/before_install.sh new file mode 100755 index 0000000..d20da31 --- /dev/null +++ b/ci/before_install.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +sudo apt-get update -qq +sudo apt-get install -qq openjdk-7-jdk openjdk-7-jre + +before_install="${TRAVIS_BUILD_DIR}/ci/before_install_${BACKEND}.sh" +[ -x ${before_install} ] && ${before_install} || echo "nothing to run" diff --git a/requirements.txt b/requirements.txt index fa22097..9c52e3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ git+https://github.com/originell/jpype.git@3fddd5599d33fb597119207cfaf13628613d32ec#egg=jpype jip==0.7 --e .