From 9c8ddf47f71cf6a31aaa812e7500ea4954db1f5e Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Sun, 26 Apr 2015 20:07:33 +0200
Subject: [PATCH] Fix travis build.

---
 .travis.yml                                      | 1 -
 ci/before_install.sh                             | 2 ++
 ci/before_install_jython.sh                      | 2 +-
 ci/before_install_nonjython.sh                   | 4 ----
 test-requirements.txt => requirements-jython.txt | 1 +
 requirements-python-2.6.txt                      | 1 +
 requirements-python-2.7.txt                      | 1 +
 requirements-python-3.4.txt                      | 1 +
 8 files changed, 7 insertions(+), 6 deletions(-)
 rename test-requirements.txt => requirements-jython.txt (54%)
 create mode 100644 requirements-python-3.4.txt

diff --git a/.travis.yml b/.travis.yml
index 91d8a66..89334d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,7 +45,6 @@ install:
   - if [ -n "$JDBC_DRIVER" ]; then envsubst < ci/dot_jip > $VIRTUAL_ENV/.jip && pip install jip==0.9.3 && 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
   - if [ -z "$JYTHON" ]; then pip install coveralls ;fi
 
 script:
diff --git a/ci/before_install.sh b/ci/before_install.sh
index 621e923..e62028c 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -3,6 +3,8 @@ set -e
 
 [ -n "$JYTHON" ] && "${TRAVIS_BUILD_DIR}/ci/before_install_jython.sh" || "${TRAVIS_BUILD_DIR}/ci/before_install_nonjython.sh"
 
+[ -n "$JYTHON" ] && cp requirements-jython.txt requirements.txt || cp requirements-python-${TRAVIS_PYTHON_VERSION}.txt requirements.txt
+
 if [ -f requirements.txt ]
 then
     pip install -r requirements.txt
diff --git a/ci/before_install_jython.sh b/ci/before_install_jython.sh
index 04f8630..7dbbf45 100755
--- a/ci/before_install_jython.sh
+++ b/ci/before_install_jython.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-JYTHON_JAR=$(./ci/mvnget.sh $JYTHON)
+JYTHON_JAR=$(${TRAVIS_BUILD_DIR}/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)")
diff --git a/ci/before_install_nonjython.sh b/ci/before_install_nonjython.sh
index 86cb755..37ca5b6 100755
--- a/ci/before_install_nonjython.sh
+++ b/ci/before_install_nonjython.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 set -e
 
-if [ -f requirements-python-${TRAVIS_PYTHON_VERSION}.txt ]
-then
-    cat requirements-python-${TRAVIS_PYTHON_VERSION}.txt >> requirements.txt
-fi
 ln -s $VIRTUAL_ENV $HOME/myvirtualenv
diff --git a/test-requirements.txt b/requirements-jython.txt
similarity index 54%
rename from test-requirements.txt
rename to requirements-jython.txt
index 9696b3b..da45555 100644
--- a/test-requirements.txt
+++ b/requirements-jython.txt
@@ -1 +1,2 @@
+JPype1==0.6.0
 unittest2==0.5.1
diff --git a/requirements-python-2.6.txt b/requirements-python-2.6.txt
index 87a36b2..da45555 100644
--- a/requirements-python-2.6.txt
+++ b/requirements-python-2.6.txt
@@ -1 +1,2 @@
 JPype1==0.6.0
+unittest2==0.5.1
diff --git a/requirements-python-2.7.txt b/requirements-python-2.7.txt
index 87a36b2..da45555 100644
--- a/requirements-python-2.7.txt
+++ b/requirements-python-2.7.txt
@@ -1 +1,2 @@
 JPype1==0.6.0
+unittest2==0.5.1
diff --git a/requirements-python-3.4.txt b/requirements-python-3.4.txt
new file mode 100644
index 0000000..87a36b2
--- /dev/null
+++ b/requirements-python-3.4.txt
@@ -0,0 +1 @@
+JPype1==0.6.0