Merge 668d5bb into 69ade5e

.travis.yml

@@ -1,33 +1,35 @@
-language: python
+language: c
+
 python:
 - '3.5'
 - '3.6'
 
+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;
 
-# 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;
+  fi
 
+- 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
 - export PATH="$HOME/miniconda/bin:$PATH"
 - hash -r
 - conda config --set always_yes yes --set changeps1 no
 
-# Adding AstroConda Channel since it contains most of the dependencies for
-# Dragons and Dragons-SOAR
 - conda config --add channels http://ssb.stsci.edu/astroconda
 - conda update -q conda
 
@@ -37,7 +39,7 @@ install:
 # Create astroconda virtual environment
 - conda env create -q python=$TRAVIS_PYTHON_VERSION -f environment.yml
 - source activate goodman_pipeline
-
+- conda info -a
 # Run DCR installer
 - ./install_dcr.sh