From b53b1a3581a7b99b3dc8979a8803871ac452b94c Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Fri, 10 Mar 2017 20:18:19 +0100
Subject: [PATCH 1/3] Use $HOME for mvn to see if this can use some travis
 standard repos or so.

---
 .travis.yml | 1 +
 tox.ini     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d88f2b8..b8fd49b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ matrix:
 before_install:
   - ci/before_install.sh
   - export PATH="$HOME/bin:$PATH"
+  - export TRAVISHOME="$HOME"
 
 install:
   - pip install coveralls
diff --git a/tox.ini b/tox.ini
index 1cf242f..a074c44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,9 +10,9 @@ python =
 
 [testenv]
 # usedevelop required to enable coveralls source code view.
-usedevelop=True
+usedevelop = True
+passenv = TRAVISHOME
 whitelist_externals = mvn
-passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 setenv =
   CLASSPATH = {envdir}/javalib/*
   driver-mock: TESTNAME=test_mock
@@ -28,10 +28,10 @@ deps =
   coverage
 commands =
   python --version
-  python ci/jipconf_subst.py {envdir} {toxworkdir}/shared
+  python ci/jipconf_subst.py {envdir} {env:TRAVISHOME:{toxworkdir}/shared}
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
-  driver-mock: mvn -Dmaven.repo.local={toxworkdir}/shared/.m2/repository -f mockdriver/pom.xml install
+  driver-mock: mvn -Dmaven.repo.local={env:TRAVISHOME:{toxworkdir}/shared}/.m2/repository -f mockdriver/pom.xml install
   driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT
   coverage run -a --source jaydebeapi test/testsuite.py {env:TESTNAME}
   driver-hsqldb: coverage run -a --source jaydebeapi test/doctests.py

From 18440f1def3553d3b7471f5e71334ca269170d7a Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Fri, 10 Mar 2017 20:31:40 +0100
Subject: [PATCH 2/3] Cache maven home explicitly.

---
 .travis.yml | 5 ++++-
 tox.ini     | 7 +++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b8fd49b..76ffbb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,10 @@ deploy:
     tags: true
     repo: baztian/jaydebeapi
 
+cache:
+  directories:
+  - $TRAVIS_BUILD_DIR/.tox/shared/.m2
+
 python:
   - '2.6'
   - '2.7'
@@ -28,7 +32,6 @@ matrix:
 before_install:
   - ci/before_install.sh
   - export PATH="$HOME/bin:$PATH"
-  - export TRAVISHOME="$HOME"
 
 install:
   - pip install coveralls
diff --git a/tox.ini b/tox.ini
index a074c44..3a237b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,7 @@ python =
 
 [testenv]
 # usedevelop required to enable coveralls source code view.
-usedevelop = True
-passenv = TRAVISHOME
+usedevelop=True
 whitelist_externals = mvn
 setenv =
   CLASSPATH = {envdir}/javalib/*
@@ -28,10 +27,10 @@ deps =
   coverage
 commands =
   python --version
-  python ci/jipconf_subst.py {envdir} {env:TRAVISHOME:{toxworkdir}/shared}
+  python ci/jipconf_subst.py {envdir} {toxworkdir}/shared
   driver-hsqldb:  jip install org.hsqldb:hsqldb:1.8.0.10
   driver-sqliteXerial:  jip install org.xerial:sqlite-jdbc:3.7.2
-  driver-mock: mvn -Dmaven.repo.local={env:TRAVISHOME:{toxworkdir}/shared}/.m2/repository -f mockdriver/pom.xml install
+  driver-mock: mvn -Dmaven.repo.local={toxworkdir}/shared/.m2/repository -f mockdriver/pom.xml install
   driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT
   coverage run -a --source jaydebeapi test/testsuite.py {env:TESTNAME}
   driver-hsqldb: coverage run -a --source jaydebeapi test/doctests.py

From 526f53d96b6457d8537e946bd3fa31dcedbdc15f Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Fri, 10 Mar 2017 20:51:02 +0100
Subject: [PATCH 3/3] Cache Jython installation.

---
 .travis.yml                 | 1 +
 ci/before_install_jython.sh | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 76ffbb1..2220629 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ deploy:
 cache:
   directories:
   - $TRAVIS_BUILD_DIR/.tox/shared/.m2
+  - $HOME/jython
 
 python:
   - '2.6'
diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh
index c9c5826..8bdb549 100755
--- a/ci/before_install_jython.sh
+++ b/ci/before_install_jython.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 set -e
 
-JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh "$JYTHON")
-java -jar ${JYTHON_JAR} -s -d $HOME/jython
+INST_DIR=$HOME/jython/jython-${JYTHON##*:}
+if [ ! -d "$INST_DIR" ]; then
+    JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/ci/mvnget.sh "$JYTHON")
+    java -jar ${JYTHON_JAR} -s -d "$INST_DIR"
+fi
 mkdir -p $HOME/bin
-ln -s $HOME/jython/bin/jython $HOME/bin/
+ln -s "$INST_DIR"/bin/jython $HOME/bin/