Commit 6026aaa0 authored by Jay's avatar Jay Committed by jay
Browse files

Attemping binstar build using the master branch.

parent 391ca886

.travis.yml

+2 −3
Original line number Original line Diff line number Diff line
@@ -29,9 +29,8 @@ install: 




  # Create a virtual env and install dependencies

  # Create a virtual env and install dependencies

  # conda is explicitly included here to try to get it into a non-root env.  It is NOT needed outside of CI testing and binstar upload.

  # conda is explicitly included here to try to get it into a non-root env.  It is NOT needed outside of CI testing and binstar upload.

  - conda create -y -q -n test-env python=$TRAVIS_PYTHON_VERSION nose numpy pillow scipy pandas networkx scikit-image sqlalchemy numexpr dill cython pyyaml conda

  - conda install python=3.5 nose numpy pillow scipy pandas networkx scikit-image sqlalchemy numexpr dill cython pyyaml

  # Activate the env



  - source activate test-env





  # Install the non-conda packages if required, requirements.txt duplicates are ignored

  # Install the non-conda packages if required, requirements.txt duplicates are ignored

  - conda install -c https://conda.anaconda.org/jlaura opencv3=3.0.0

  - conda install -c https://conda.anaconda.org/jlaura opencv3=3.0.0