From 6062f4dd587ebcc413e5d838702c74cdd39792a1 Mon Sep 17 00:00:00 2001 From: tqchen Date: Wed, 29 Jul 2015 20:18:54 -0700 Subject: [PATCH] update --- scripts/travis_osx_install.sh | 3 ++- scripts/travis_script.sh | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/travis_osx_install.sh b/scripts/travis_osx_install.sh index 4b4c714b8..95e5838a8 100755 --- a/scripts/travis_osx_install.sh +++ b/scripts/travis_osx_install.sh @@ -8,5 +8,6 @@ brew update if [ ${TASK} == "python-package" ]; then brew install python git - easy_install pip scipy numpy + easy_install pip + pip install numpy scipy fi diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 85bfab47f..0d4cf8049 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -7,7 +7,7 @@ if [ ${TASK} == "lint" ]; then fi fi -if [ ${TRAVIS_OS_NAME} != "osx" ]; then +if [ ${TRAVIS_OS_NAME} == "osx" ]; then export no_omp=1 fi @@ -37,7 +37,10 @@ if [ ${TASK} == "python-package" ]; then nosetests tests/python || exit -1 fi +# only test java under linux for now if [ ${TASK} == "java-package" ]; then - make java CXX=${CXX} || exit -1 - scripts/travis_java_script.sh || exit -1 + if [ ${TRAVIS_OS_NAME} != "osx" ]; then + make java CXX=${CXX} || exit -1 + scripts/travis_java_script.sh || exit -1 + fi fi