Commit 0e02b66c authored by Kelvin Rodriguez's avatar Kelvin Rodriguez Committed by GitHub
Browse files

Merge pull request #189 from Kelvinrr/master 

Now using condaforge opencv
parents 9f9a7e93 c56fc6c5

.travis.yml

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ install: 
  - conda config --add channels jlaura

  - conda config --set ssl_verify false

  - conda install python=$PYTHON_VERSION

  - conda install -c conda-forge numpy

  - conda install -c jlaura plio opencv3=3.0.0

  - conda install -c conda-forge numpy opencv

  - conda install -c jlaura plio

  - conda install -c conda-forge vlfeat

  - conda install -c menpo cyvlfeat

  - pip install pillow pysal