diff --git a/ci/before_install.sh b/ci/before_install.sh index e62028c..1b4a35f 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e [ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || "${TRAVIS_BUILD_DIR}/ci/before_install_nonjython.sh" diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh index d1b5ff8..21765cf 100755 --- a/ci/before_install_jython.sh +++ b/ci/before_install_jython.sh @@ -1,11 +1,8 @@ -#!/bin/bash +#!/bin/sh set -e JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh $JYTHON) java -jar ${JYTHON_JAR} -s -d $HOME/jython -$HOME/jython/bin/jython -m ensurepip - -# Install the latest virtualenv compatible with Jython -$HOME/jython/bin/pip install virtualenv==1.9.1 +$HOME/jython/bin/pip install virtualenv $HOME/jython/bin/virtualenv $HOME/myvirtualenv diff --git a/ci/before_install_nonjython.sh b/ci/before_install_nonjython.sh index 37ca5b6..597e62a 100755 --- a/ci/before_install_nonjython.sh +++ b/ci/before_install_nonjython.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e ln -s $VIRTUAL_ENV $HOME/myvirtualenv diff --git a/ci/mvnget.sh b/ci/mvnget.sh index 6e55d17..fcfba92 100755 --- a/ci/mvnget.sh +++ b/ci/mvnget.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -e ARTIFACT_SPEC=$1 GROUP_ID=${ARTIFACT_SPEC%%:*} diff --git a/ci/simulate_travis_jython.sh b/ci/simulate_travis_jython.sh deleted file mode 100755 index bbaca46..0000000 --- a/ci/simulate_travis_jython.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -set -e - -export BACKEND=hsqldb -#export JYTHON=org.python:jython-installer:2.5.3 -export JYTHON=org.python:jython-installer:2.7.0 -jip install $JYTHON -_JIP_HOME=$HOME/.jip -export HOME=`mktemp -d` -export TRAVIS_BUILD_DIR=$HOME/baztian/jaydebeapi - -git clone "$(git rev-parse --show-toplevel)" $TRAVIS_BUILD_DIR -mkdir -p $TRAVIS_BUILD_DIR -cp -r "$(git rev-parse --show-toplevel)"/* $TRAVIS_BUILD_DIR - -cd $TRAVIS_BUILD_DIR - -mkdir -p $HOME/.jip/cache/org.python/ -cp -r $_JIP_HOME/cache/org.python/jython-installer* $HOME/.jip/cache/org.python/ - -virtualenv $HOME/orig -source $HOME/orig/bin/activate -pip install --upgrade virtualenv - -virtualenv $HOME/new -source $HOME/new/bin/activate - -# required as new virtualenv doesn't have pip installed virtualenv -pip install --upgrade virtualenv - -$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 . -pip install -r test-requirements.txt -jip install org.xerial:sqlite-jdbc:3.7.2 -jip install org.hsqldb:hsqldb:1.8.0.10 - -export CLASSPATH=$VIRTUAL_ENV/javalib/* -python test/testsuite.py test_integration.HsqldbTest - -echo Remove ${HOME}? -read -rm -r $HOME