From d92b8bdbf2b6aa072acfa3757862d0e7c661c780 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Sat, 25 Apr 2015 16:19:24 +0200
Subject: [PATCH] Migrate travis setup to jip 0.9.2 for python 3
 compatablility. Don't use jip to install Jython for build time speedup.

---
 .travis.yml                 |  2 +-
 ci/before_install_jython.sh |  8 ++------
 ci/mvnget.sh                | 13 +++++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 ci/mvnget.sh

diff --git a/.travis.yml b/.travis.yml
index a5ba05c..59ff60a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,7 +41,7 @@ before_install:
 
 install:
   - if [ "$JDBC_DRIVER" == "org.jaydebeapi:mockdriver:1.0-SNAPSHOT" ]; then (cd mockdriver && mvn install) ;fi
-  - if [ -n "$JDBC_DRIVER" ]; then envsubst < ci/dot_jip > $VIRTUAL_ENV/.jip && pip install jip==0.7 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
+  - if [ -n "$JDBC_DRIVER" ]; then envsubst < ci/dot_jip > $VIRTUAL_ENV/.jip && pip install jip==0.9.2 && jip install $JDBC_DRIVER && export CLASSPATH=$VIRTUAL_ENV/javalib/* ;fi # TODO: Fix jip to search for local maven repo without twaking .jip
   - source $HOME/myvirtualenv/bin/activate
   - pip install -e .
   - pip install -r test-requirements.txt
diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh
index daa096c..04f8630 100755
--- a/ci/before_install_jython.sh
+++ b/ci/before_install_jython.sh
@@ -1,12 +1,8 @@
 #!/bin/bash
 set -e
 
-pip install jip==0.7
-jip install $JYTHON
-NON_GROUP_ID=${JYTHON#*:}
-_JYTHON_BASENAME=${NON_GROUP_ID/:/-}
-OLD_VIRTUAL_ENV=$VIRTUAL_ENV
-java -jar $OLD_VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d $HOME/jython
+JYTHON_JAR=$(./ci/mvnget.sh $JYTHON)
+java -jar ${JYTHON_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" ]
diff --git a/ci/mvnget.sh b/ci/mvnget.sh
new file mode 100644
index 0000000..6e55d17
--- /dev/null
+++ b/ci/mvnget.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+ARTIFACT_SPEC=$1
+GROUP_ID=${ARTIFACT_SPEC%%:*}
+NON_GROUP_ID=${ARTIFACT_SPEC#*:}
+ARTIFACT_NAME=`python -c "import re;print re.search(r':(.*):', '$ARTIFACT_SPEC').group(1)"`
+_PATH=${GROUP_ID/./\/}/$ARTIFACT_NAME
+_ARTIFACT_SPEC_BASENAME=${NON_GROUP_ID/:/-}
+VERSION=${ARTIFACT_SPEC##*:}
+echo "Downloading ${ARTIFACT_NAME} version ${VERSION} group id ${GROUP_ID}..." >&2
+wget http://search.maven.org/remotecontent?filepath=${_PATH}/$VERSION/${_ARTIFACT_SPEC_BASENAME}.jar -O ${_ARTIFACT_SPEC_BASENAME}.jar
+echo "...download of ${_ARTIFACT_SPEC_BASENAME}.jar finished." >&2
+echo ${_ARTIFACT_SPEC_BASENAME}.jar