diff --git a/.travis.yml b/.travis.yml index 37eb0054..36e1a909 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,23 @@ -language: python -python: -- '3.5' -- '3.6' +language: c + +os: + - linux + - osx branches: only: - master -# before_install: -# - ./install_dcr.sh - - install: -# - export PATH="$PATH:$HOME/build/soar-telescope/goodman_pipeline/dcrbin" -- sudo apt-get update +- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + sudo apt-get update && + wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; + fi -# Here we install Anaconda to work with Virtual Environments. We do this -# conditionally because it saves us some downloading if the version is the same. -- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; +- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + curl https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh --output miniconda.sh; + fi - bash miniconda.sh -b -p $HOME/miniconda diff --git a/install_dcr.sh b/install_dcr.sh index 1b0b2ae5..141bfb7c 100755 --- a/install_dcr.sh +++ b/install_dcr.sh @@ -10,8 +10,8 @@ then echo 'You do not have any virtual environment activated' else - ENV_NAME=$(conda info | grep 'active environment' | sed 's/\//g' | sed "s/[: ]//g") - ENV_PATH=$(conda info | grep 'active env location' | sed 's/\//g' | sed "s/[: ]//g") + ENV_NAME=$(conda info | grep 'active environment' | sed 's/active environment//g' | sed "s/[: ]//g") + ENV_PATH=$(conda info | grep 'active env location' | sed 's/active env location//g' | sed "s/[: ]//g") echo "Using Virtual Environment: " $ENV_NAME echo "Environment path information: " $ENV_PATH if [ -d $SOURCE_DIR ]