Commit 65a5e1b6 authored by jlaura's avatar jlaura Committed by GitHub
Browse files

Merge pull request #132 from jlaura/master 

Still picking up menpo openCV
parents a446f412 a74ea565

.travis.yml

+1 −1
Changes for .travis.yml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -43,10 +43,10 @@ install: 
  # Install dependencies

  - conda config --add channels conda-forge

  - conda config --add channels jlaura

  - conda config --add channels menpo

  - conda install -c conda-forge numpy

  - conda install -c jlaura plio

  - conda install -c conda-forge vlfeat opencv3=3.1.0

  - conda config --add channels menpo

  - conda install -c menpo cyvlfeat

  - pip install pillow pysal

  - conda install scipy networkx numexpr dill cython pyyaml matplotlib runipy