Fix travis build.

.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:

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

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)")

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

requirements-jython.txt

@@ -1 +1,2 @@
+JPype1==0.6.0
 unittest2==0.5.1

requirements-python-2.6.txt

@@ -1 +1,2 @@
 JPype1==0.6.0
+unittest2==0.5.1

requirements-python-2.7.txt

@@ -1 +1,2 @@
 JPype1==0.6.0
+unittest2==0.5.1

requirements-python-3.4.txt

@@ -0,0 +1 @@
+JPype1==0.6.0