From a8376a1d7c754164946816ff0883b1a65783e19b Mon Sep 17 00:00:00 2001 From: baztian Date: Wed, 12 Feb 2014 12:59:12 +0100 Subject: [PATCH] Fix Travis yml error --- .travis.yml | 1 - ci/before_install.sh | 2 ++ ci/simulate_travis_jython.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7775141..c619787 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ before_install: - source $HOME/myvirtualenv/bin/activate install: - - [ -x requirements.txt ] && pip install -r requirements.txt - pip install jip==0.7 - pip install -e . - jip install org.xerial:sqlite-jdbc:3.7.2 diff --git a/ci/before_install.sh b/ci/before_install.sh index 8e544d2..de105a4 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -5,3 +5,5 @@ sudo apt-get update -qq sudo apt-get install -qq openjdk-7-jdk openjdk-7-jre [ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || "${TRAVIS_BUILD_DIR}/ci/before_install_nonjython.sh" + +[ -x requirements.txt ] && pip install -r requirements.txt diff --git a/ci/simulate_travis_jython.sh b/ci/simulate_travis_jython.sh index 783ef53..42b8070 100755 --- a/ci/simulate_travis_jython.sh +++ b/ci/simulate_travis_jython.sh @@ -28,6 +28,7 @@ $TRAVIS_BUILD_DIR/ci/before_install_jython.sh source $HOME/myvirtualenv/bin/activate [ -x requirements.txt ] && pip install -r requirements.txt + pip install jip==0.7 pip install -e . jip install org.xerial:sqlite-jdbc:3.7.2