From 1188f14bef41924afa0f573a87bb04d5a952e238 Mon Sep 17 00:00:00 2001 From: baztian Date: Tue, 11 Feb 2014 18:30:40 +0100 Subject: [PATCH] Fix typo. Setup compatible virtualenv for Jython < 2.6 --- .travis.yml | 2 +- ci/before_install_jython.sh | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd37011..f7522df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: install: - pip install -r requirements.txt - - pip pinstall jip==0.7 + - pip install jip==0.7 - 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_jython.sh b/ci/before_install_jython.sh index 11a45df..1786bac 100755 --- a/ci/before_install_jython.sh +++ b/ci/before_install_jython.sh @@ -6,4 +6,11 @@ jip install org.python:$JYTHON _JYTHON_BASENAME=${JYTHON/:/-} java -jar $VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d $VIRTUAL_ENV/jython touch requirements.txt +BEFORE_PY_26=$($VIRTUAL_ENV/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 virtualenv -p $VIRTUAL_ENV/jython/bin/jython ~/myvirtualenv