Fix travis build.

This commit is contained in:
baztian
2015-04-26 20:07:33 +02:00
parent 453eb61598
commit 9c8ddf47f7
8 changed files with 7 additions and 6 deletions
+2
View File
@@ -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
+1 -1
View File
@@ -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)")
-4
View File
@@ -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