Commit e332ce78 authored by Jason R Laura's avatar Jason R Laura
Browse files

Merge branch 'master' of https://github.com/jlaura/autocnet

parents 2adac495 f64e25d7

.travis.yml

+2 −1
Changes for .travis.yml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ install: 
  - conda config --add channels jlaura

  - conda install -c conda-forge numpy

  - conda install -c jlaura plio

  - conda install -c conda-forge vlfeat opencv3

  - conda install -c conda-forge vlfeat opencv=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