Commit 66a54f74 authored by Evin Dunn's avatar Evin Dunn
Browse files

Merge branch 'dev' of github.com:USGS-Astrogeology/autocnet into dev

parents 9fee1d07 0e02b66c

.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

README.rst

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ We suggest using Anaconda Python to install Autocnet within a virtual environmen 
  * ``conda create -n <your_environment_name> python=3 && source activate <your_environment_name>``

1. Bring up a command line and add three channels to your conda config (``~/condarc``):

  * ``conda config --add channels conda-forge``

  * ``conda condig --add channels jlaura``

  * ``conda config --add channels jlaura``

  * ``conda config --add channels menpo``

1. Finally, install autocnet: ``conda install -c jlaura autocnet-dev``