diff --git a/.travis.yml b/.travis.yml index 2d1b2bc..650f4d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ matrix: include: - python: 2.7 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: - ci/before_install.sh diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh index 5f622bf..8748f2d 100755 --- a/ci/before_install_jython.sh +++ b/ci/before_install_jython.sh @@ -8,18 +8,15 @@ _JYTHON_BASENAME=${NON_GROUP_ID/:/-} OLD_VIRTUAL_ENV=$VIRTUAL_ENV 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 - # last version compatible with Python version before 2.6 - pip install virtualenv==1.9.1 -fi +# Travis CI virtualenv version is greater 1.9.1, which was the +# last version compatible with Python version before 2.6 +pip install virtualenv==1.9.1 virtualenv --version # --distribute is a workaround as setuptools don't install on Jython properly 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" ] then # No SSL support for Jython diff --git a/ci/simulate_travis_jython.sh b/ci/simulate_travis_jython.sh index 42b8070..18fed01 100755 --- a/ci/simulate_travis_jython.sh +++ b/ci/simulate_travis_jython.sh @@ -2,12 +2,17 @@ set -e export BACKEND=hsqldb -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.5.3 +export JYTHON=org.python:jython-installer:2.7-b3 +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/ @@ -31,11 +36,12 @@ source $HOME/myvirtualenv/bin/activate pip install jip==0.7 pip install -e . +pip install -r requirements_test.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.py +python test/testsuite.py echo Remove ${HOME}? read