Skip to content
Snippets Groups Projects
Commit 71909a32 authored by jay's avatar jay
Browse files

Merge branch 'master' into camera

parents 249bdeeb af1cb29e
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
.travis.yml
+ 2
− 2
View file @ 71909a32
...@@ -36,8 +36,8 @@ before_install: ...@@ -36,8 +36,8 @@ before_install:
install: install:
- conda config --add channels conda-forge - conda config --add channels conda-forge
- conda install -c conda-forge libgdal gdal numpy xerces-c - conda install -c conda-forge libgdal gdal numpy pyproj h5py pvl scipy protobuf affine jinja2 networkx pandas sqlalchemy pyyaml
- conda install -q h5py pandas sqlalchemy pyyaml networkx affine protobuf scipy pvl - conda install -c usgs-astrogeology usgscam
# Development installation # Development installation
- conda install -q pytest pytest-cov sh coveralls nbsphinx - conda install -q pytest pytest-cov sh coveralls nbsphinx
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment