From 310ba82131b7aa9f4b941c2d9d33e9815a0914e0 Mon Sep 17 00:00:00 2001 From: Robert Nishihara Date: Thu, 13 Jul 2017 09:23:04 -0700 Subject: [PATCH] Use miniconda for all travis tests. (#728) * Use miniconda for all travis tests. * Fix. * Fix. --- .travis.yml | 6 +++--- .travis/install-dependencies.sh | 13 ++++++++++--- .travis/install-ray.sh | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b63ab1e4..92ca5db2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,7 @@ matrix: - sudo apt-get install -qq valgrind install: - ./.travis/install-dependencies.sh + - export PATH="$HOME/miniconda/bin:$PATH" - ./.travis/install-ray.sh - cd python/ray/core @@ -62,10 +63,9 @@ matrix: install: - ./.travis/install-dependencies.sh + - export PATH="$HOME/miniconda/bin:$PATH" - ./.travis/install-ray.sh - - if [[ "$PYTHON" == "3.5" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi - - cd python/ray/core - bash ../../../src/common/test/run_tests.sh - bash ../../../src/plasma/test/run_tests.sh @@ -73,7 +73,7 @@ install: - cd ../../.. script: - - if [[ "$PYTHON" == "3.5" ]]; then export PATH="$HOME/miniconda/bin:$PATH"; fi + - export PATH="$HOME/miniconda/bin:$PATH" - python src/numbuf/python/test/runtest.py diff --git a/.travis/install-dependencies.sh b/.travis/install-dependencies.sh index 13f0fb0ad..2050cdf69 100755 --- a/.travis/install-dependencies.sh +++ b/.travis/install-dependencies.sh @@ -20,7 +20,11 @@ fi if [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "linux" ]]; then sudo apt-get update sudo apt-get install -y cmake build-essential autoconf curl libtool python-dev python-numpy python-pip libboost-all-dev unzip - sudo pip install cloudpickle funcsigs click colorama psutil redis tensorflow flatbuffers + # Install miniconda. + wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh + bash miniconda.sh -b -p $HOME/miniconda + export PATH="$HOME/miniconda/bin:$PATH" + pip install numpy cloudpickle funcsigs click colorama psutil redis tensorflow flatbuffers elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "linux" ]]; then sudo apt-get update sudo apt-get install -y cmake python-dev python-numpy build-essential autoconf curl libtool libboost-all-dev unzip @@ -40,8 +44,11 @@ elif [[ "$PYTHON" == "2.7" ]] && [[ "$platform" == "macosx" ]]; then brew update fi brew install cmake automake autoconf libtool boost - sudo easy_install pip - sudo pip install numpy cloudpickle funcsigs click colorama psutil redis tensorflow flatbuffers --ignore-installed six + # Install miniconda. + wget https://repo.continuum.io/miniconda/Miniconda2-latest-MacOSX-x86_64.sh -O miniconda.sh + bash miniconda.sh -b -p $HOME/miniconda + export PATH="$HOME/miniconda/bin:$PATH" + pip install numpy cloudpickle funcsigs click colorama psutil redis tensorflow flatbuffers elif [[ "$PYTHON" == "3.5" ]] && [[ "$platform" == "macosx" ]]; then # check that brew is installed which -s brew diff --git a/.travis/install-ray.sh b/.travis/install-ray.sh index a3555248e..28aeeef32 100755 --- a/.travis/install-ray.sh +++ b/.travis/install-ray.sh @@ -10,7 +10,7 @@ echo "PYTHON is $PYTHON" if [[ "$PYTHON" == "2.7" ]]; then pushd "$ROOT_DIR/../python" - sudo python setup.py install + python setup.py install --user popd elif [[ "$PYTHON" == "3.5" ]]; then