Add Jython 2.7-b3 to Travis build matrix

master
baztian 2015-02-07 19:05:14 +01:00
parent 64435fa95b
commit e3379fe8da
3 changed files with 15 additions and 10 deletions

View File

@ -17,6 +17,8 @@ matrix:
include: include:
- python: 2.7 - python: 2.7
env: JYTHON=org.python:jython-installer:2.5.3 BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest env: JYTHON=org.python:jython-installer:2.5.3 BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest
- python: 2.7
env: JYTHON=org.python:jython-installer:2.7-b3 BACKEND=hsqldb TESTNAME=test_integration.HsqldbTest
before_install: before_install:
- ci/before_install.sh - ci/before_install.sh

View File

@ -8,18 +8,15 @@ _JYTHON_BASENAME=${NON_GROUP_ID/:/-}
OLD_VIRTUAL_ENV=$VIRTUAL_ENV OLD_VIRTUAL_ENV=$VIRTUAL_ENV
java -jar $OLD_VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d $HOME/jython java -jar $OLD_VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d $HOME/jython
BEFORE_PY_26=$($HOME/jython/bin/jython -c "import sys; print sys.version_info < (2, 6)")
if [ "$BEFORE_PY_26" == "True" ]
then
# Travis CI virtualenv version is greater 1.9.1, which was the # Travis CI virtualenv version is greater 1.9.1, which was the
# last version compatible with Python version before 2.6 # last version compatible with Python version before 2.6
pip install virtualenv==1.9.1 pip install virtualenv==1.9.1
fi
virtualenv --version virtualenv --version
# --distribute is a workaround as setuptools don't install on Jython properly # --distribute is a workaround as setuptools don't install on Jython properly
virtualenv --distribute -p $HOME/jython/bin/jython $HOME/myvirtualenv virtualenv --distribute -p $HOME/jython/bin/jython $HOME/myvirtualenv
BEFORE_PY_26=$($HOME/jython/bin/jython -c "import sys; print sys.version_info < (2, 6)")
if [ "$BEFORE_PY_26" == "True" ] if [ "$BEFORE_PY_26" == "True" ]
then then
# No SSL support for Jython # No SSL support for Jython

View File

@ -2,12 +2,17 @@
set -e set -e
export BACKEND=hsqldb export BACKEND=hsqldb
export JYTHON=org.python:jython-installer:2.5.3 #export JYTHON=org.python:jython-installer:2.5.3
#export JYTHON=org.python:jython-installer:2.7-b1 export JYTHON=org.python:jython-installer:2.7-b3
jip install $JYTHON
_JIP_HOME=$HOME/.jip _JIP_HOME=$HOME/.jip
export HOME=`mktemp -d` export HOME=`mktemp -d`
export TRAVIS_BUILD_DIR=$HOME/baztian/jaydebeapi export TRAVIS_BUILD_DIR=$HOME/baztian/jaydebeapi
git clone "$(git rev-parse --show-toplevel)" $TRAVIS_BUILD_DIR 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 cd $TRAVIS_BUILD_DIR
mkdir -p $HOME/.jip/cache/org.python/ mkdir -p $HOME/.jip/cache/org.python/
@ -31,11 +36,12 @@ source $HOME/myvirtualenv/bin/activate
pip install jip==0.7 pip install jip==0.7
pip install -e . pip install -e .
pip install -r requirements_test.txt
jip install org.xerial:sqlite-jdbc:3.7.2 jip install org.xerial:sqlite-jdbc:3.7.2
jip install org.hsqldb:hsqldb:1.8.0.10 jip install org.hsqldb:hsqldb:1.8.0.10
export CLASSPATH=$VIRTUAL_ENV/javalib/* export CLASSPATH=$VIRTUAL_ENV/javalib/*
python test.py python test/testsuite.py
echo Remove ${HOME}? echo Remove ${HOME}?
read read