From 1cd46e1311f07cab7bec520271fa98e5e7e3adb4 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 11:30:33 +0100
Subject: [PATCH 1/2] Update virtualenv for jython.

---
 ci/before_install_jython.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh
index d1b5ff8..f6c8956 100755
--- a/ci/before_install_jython.sh
+++ b/ci/before_install_jython.sh
@@ -6,6 +6,5 @@ java -jar ${JYTHON_JAR} -s -d $HOME/jython
 
 $HOME/jython/bin/jython -m ensurepip
 
-# Install the latest virtualenv compatible with Jython
-$HOME/jython/bin/pip install virtualenv==1.9.1
+$HOME/jython/bin/pip install virtualenv
 $HOME/jython/bin/virtualenv $HOME/myvirtualenv

From 9e1cf4fbad4adf5e65fa9bc20f5eedefdf72029e Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Wed, 8 Mar 2017 11:40:06 +0100
Subject: [PATCH 2/2] Simplified helper scripts.

Fix possible shell incompatibility introduced in last commit.
---
 ci/before_install.sh           |  2 +-
 ci/before_install_jython.sh    |  4 +--
 ci/before_install_nonjython.sh |  2 +-
 ci/mvnget.sh                   |  1 +
 ci/simulate_travis_jython.sh   | 48 ----------------------------------
 5 files changed, 4 insertions(+), 53 deletions(-)
 delete mode 100755 ci/simulate_travis_jython.sh

diff --git a/ci/before_install.sh b/ci/before_install.sh
index e62028c..1b4a35f 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 [ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || "${TRAVIS_BUILD_DIR}/ci/before_install_nonjython.sh"
diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh
index f6c8956..21765cf 100755
--- a/ci/before_install_jython.sh
+++ b/ci/before_install_jython.sh
@@ -1,10 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh $JYTHON)
 java -jar ${JYTHON_JAR} -s -d $HOME/jython
 
-$HOME/jython/bin/jython -m ensurepip
-
 $HOME/jython/bin/pip install virtualenv
 $HOME/jython/bin/virtualenv $HOME/myvirtualenv
diff --git a/ci/before_install_nonjython.sh b/ci/before_install_nonjython.sh
index 37ca5b6..597e62a 100755
--- a/ci/before_install_nonjython.sh
+++ b/ci/before_install_nonjython.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 ln -s $VIRTUAL_ENV $HOME/myvirtualenv
diff --git a/ci/mvnget.sh b/ci/mvnget.sh
index 6e55d17..fcfba92 100755
--- a/ci/mvnget.sh
+++ b/ci/mvnget.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 ARTIFACT_SPEC=$1
 GROUP_ID=${ARTIFACT_SPEC%%:*}
diff --git a/ci/simulate_travis_jython.sh b/ci/simulate_travis_jython.sh
deleted file mode 100755
index bbaca46..0000000
--- a/ci/simulate_travis_jython.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-set -e
-
-export BACKEND=hsqldb
-#export JYTHON=org.python:jython-installer:2.5.3
-export JYTHON=org.python:jython-installer:2.7.0
-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/
-cp -r $_JIP_HOME/cache/org.python/jython-installer* $HOME/.jip/cache/org.python/
-
-virtualenv $HOME/orig
-source $HOME/orig/bin/activate
-pip install --upgrade virtualenv
-
-virtualenv $HOME/new
-source $HOME/new/bin/activate
-
-# required as new virtualenv doesn't have pip installed virtualenv
-pip install --upgrade virtualenv
-
-$TRAVIS_BUILD_DIR/ci/before_install_jython.sh
-
-source $HOME/myvirtualenv/bin/activate
-
-[ -x requirements.txt ] && pip install -r requirements.txt
-
-pip install jip==0.7
-pip install -e .
-pip install -r test-requirements.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/testsuite.py test_integration.HsqldbTest
-
-echo Remove ${HOME}?
-read
-rm -r $HOME