Merge remote-tracking branch 'refs/remotes/origin/conda-install' into…

… develop

.travis.yml

@@ -3,12 +3,35 @@ python:
   - "2.7"
   - "3.4"
   - "3.5"
-  - "3.5-dev" # 3.5 development branch
-  - "nightly" # currently points to 3.6-dev
+  #- "3.5-dev" # 3.5 development branch
+  #- "nightly" # currently points to 3.6-dev
 # command to install dependencies
+
 #install: "pip install -r requirements.txt"
+# Setup anaconda
+before_install:
+  # http://conda.pydata.org/docs/travis.html
+  - sudo apt-get update
+  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+      wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh -O miniconda.sh;
+    else
+      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O 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
+  - conda update -q conda
+  - conda info -a
 install:  
-  - python setup.py install  # Try this first
+  #- conda install --yes python=$TRAVIS_PYTHON_VERSION  numpy scipy matplotlib #nose atlas dateutil pandas statsmodels
+  # Coverage packages are on my binstar channel
+  #- conda install --yes -c dan_blanchard python-coveralls nose-cov
+  - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy scipy
+  - source activate test-environment
+  - python setup.py install
+
+
   - pip install python-coveralls
   - pip install pytest-cov
 # install:  
@@ -20,7 +43,7 @@ install:
 # command to run tests
 script: 
   #- py.test -cov coveralls --cov-report term-missing
-  - py.test --cov=spectrum_overload spectrum_overload/test/ --cov-report term-missing
+  - py.test --cov=spectrum_overload spectrum_overload/ --cov-report term-missing
 
 after_success:
   - coveralls