Commit 71909a32 authored by jay's avatar jay
Browse files

Merge branch 'master' into camera

parents 249bdeeb af1cb29e

.travis.yml

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ before_install: 


install:

  - conda config --add channels conda-forge

  - conda install -c conda-forge libgdal gdal numpy xerces-c

  - conda install -q h5py pandas sqlalchemy pyyaml networkx affine protobuf scipy pvl

  - conda install -c conda-forge libgdal gdal numpy pyproj h5py pvl scipy protobuf affine jinja2 networkx pandas sqlalchemy pyyaml

  - conda install -c usgs-astrogeology usgscam

  # Development installation

  - conda install -q pytest pytest-cov sh coveralls nbsphinx