From 749f0600f006e7ed4a89f948388c32038e446545 Mon Sep 17 00:00:00 2001 From: baztian Date: Wed, 12 Feb 2014 10:51:26 +0100 Subject: [PATCH] Make pip work for Jython < 2.6 by favouring distribute over setuptools. Disable ssl --- .travis.yml | 7 +++---- ci/before_install_jython.sh | 30 +++++++++++++++--------------- ci/before_install_nonjython.sh | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d0e399..7775141 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,15 +15,14 @@ matrix: # env: BACKEND=sqlitejdbc include: - python: 2.7 - env: JYTHON=jython-installer:2.5.3 BACKEND=hsqldb + env: JYTHON=org.python:jython-installer:2.5.3 BACKEND=hsqldb before_install: - - export -f deactivate - ci/before_install.sh - - source ~/myvirtualenv/bin/activate + - source $HOME/myvirtualenv/bin/activate install: - - pip install -r requirements.txt + - [ -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_jython.sh b/ci/before_install_jython.sh index 0334c29..461669f 100755 --- a/ci/before_install_jython.sh +++ b/ci/before_install_jython.sh @@ -2,25 +2,25 @@ set -e pip install jip==0.7 -jip install org.python:$JYTHON -_JYTHON_BASENAME=${JYTHON/:/-} +jip install $JYTHON +NON_GROUP_ID=${JYTHON#*:} +_JYTHON_BASENAME=${NON_GROUP_ID/:/-} OLD_VIRTUAL_ENV=$VIRTUAL_ENV -deactivate -java -jar $OLD_VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d ~/jython -touch requirements.txt -BEFORE_PY_26=$(~/jython/bin/jython -c "import sys; print sys.version_info < (2, 6)") +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 - #curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py -o get-pip.py - #curl http://peak.telecommunity.com/dist/ez_setup.py -o ez_setup.py - #$VIRTUAL_ENV/jython/bin/jython get-pip.py - #$VIRTUAL_ENV/jython/bin/jython ez_setup.py - #$VIRTUAL_ENV/jython/bin/easy_install install virtualenv==1.9.1 - #sudo pip install virtualenv==1.9.1 - sudo pip install virtualenv==1.7.1.2 + pip install virtualenv==1.9.1 + # No SSL support for Jython + mkdir $HOME/.pip + cat > $HOME/.pip/pip.conf <> requirements.txt -ln -s $VIRTUAL_ENV ~/myvirtualenv +ln -s $VIRTUAL_ENV $HOME/myvirtualenv