From 2c7361234dbe7870bf54439fbc449241a3565411 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Tue, 11 Feb 2014 17:31:11 +0100
Subject: [PATCH] Install and run Jython build

---
 .travis.yml                                 | 7 ++++---
 ci/before_install.sh                        | 3 +--
 ci/before_install_jython.sh                 | 8 ++++++++
 ci/before_install_nonjython.sh              | 4 ++++
 ci/install.sh                               | 5 +++++
 requirements.txt => requirements_python.txt | 1 -
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 ci/before_install_jython.sh
 create mode 100644 ci/before_install_nonjython.sh
 create mode 100644 ci/install.sh
 rename requirements.txt => requirements_python.txt (91%)

diff --git a/.travis.yml b/.travis.yml
index 8e559d9..a19f043 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ python:
 
 env:
   matrix:
-    - PYTHON_IMPL=cPython BACKEND=hsqldb
-    - PYTHON_IMPL=cPython BACKEND=sqlitejdbc
+    - BACKEND=hsqldb
+    - BACKEND=sqlitejdbc
 
 matrix:
   # exclude:
@@ -15,10 +15,11 @@ matrix:
   #     env: BACKEND=sqlitejdbc
   include:
     - python: 2.7
-      env: PYTHON_IMPL=jython_2_5_3 BACKEND=hsqldb
+      env: JYTHON=jython-installer:2.5.3 BACKEND=hsqldb
 
 before_install:
   - ci/before_install.sh
+  - source ~/myvirtualenv/bin/activate
 
 install:
   - pip install -r requirements.txt
diff --git a/ci/before_install.sh b/ci/before_install.sh
index d20da31..87c0cb6 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -3,5 +3,4 @@
 sudo apt-get update -qq
 sudo apt-get install -qq openjdk-7-jdk openjdk-7-jre
 
-before_install="${TRAVIS_BUILD_DIR}/ci/before_install_${BACKEND}.sh"
-[ -x ${before_install} ] && ${before_install} || echo "nothing to run"
+[ -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
new file mode 100644
index 0000000..db7de6a
--- /dev/null
+++ b/ci/before_install_jython.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+pip install jip==0.7
+jip install org.python:$JYTHON
+_JYTHON_BASENAME=${JYTHON/:/.}
+java -jar $VIRTUAL_ENV/javalib/${_JYTHON_BASENAME}.jar -s -d $VIRTUAL_ENV/jython
+touch requirements.txt
+virtualenv -p $VIRTUAL_ENV/jython/bin/jython ~/myvirtualenv
diff --git a/ci/before_install_nonjython.sh b/ci/before_install_nonjython.sh
new file mode 100644
index 0000000..a43d70d
--- /dev/null
+++ b/ci/before_install_nonjython.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cat requirements_python.txt >> requirements.txt
+ln -s $VIRTUAL_ENV ~/myvirtualenv
diff --git a/ci/install.sh b/ci/install.sh
new file mode 100644
index 0000000..aa79b1b
--- /dev/null
+++ b/ci/install.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+pip install jip==0.7
+
+install="${TRAVIS_BUILD_DIR}/ci/install_${BACKEND}.sh"
+[ -x ${install} ] && ${install} || echo "nothing to run"
diff --git a/requirements.txt b/requirements_python.txt
similarity index 91%
rename from requirements.txt
rename to requirements_python.txt
index 9c52e3e..473a01d 100644
--- a/requirements.txt
+++ b/requirements_python.txt
@@ -1,2 +1 @@
 git+https://github.com/originell/jpype.git@3fddd5599d33fb597119207cfaf13628613d32ec#egg=jpype
-jip==0.7