Merge 24f82b3 into 5ba86d6

DOI-USGS · Sep 26, 2018 · 2988175 · 2988175
2 parents 5ba86d6 + 24f82b3
commit 2988175
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,9 +40,9 @@ install:
   - conda config --add channels usgs-astrogeology
   - conda config --add channels conda-forge
   - if $HAS_GDAL; then
-      conda install libgdal gdal numpy pyproj h5py pvl scipy protobuf affine jinja2 networkx pandas sqlalchemy pyyaml ncurses pytest pytest-cov sh coveralls nbsphinx;
+      conda env update -n test -f environment.yml;
     else
-      conda install numpy pyproj h5py pvl scipy protobuf affine jinja2 networkx pandas sqlalchemy pyyaml ncurses pytest pytest-cov sh coveralls nbsphinx;
+      conda env update -n test -f environment_noGDAL.yml;
     fi
 
 script:

diff --git a/environment.yml b/environment.yml
@@ -3,8 +3,8 @@ channels:
   - conda-forge
   - usgs-astrogeology
 dependencies:
-  - libgdal
-  - gdal
+  - libgdal 
+  - gdal 
   - numpy 
   - pyproj 
   - h5py 
@@ -19,4 +19,7 @@ dependencies:
   - pyyaml 
   - ncurses 
   - pytest 
-  - pytest-cov
+  - pytest-cov 
+  - sh 
+  - coveralls 
+  - nbsphinx
diff --git a/environment_noGDAL.yml b/environment_noGDAL.yml
@@ -0,0 +1,23 @@
+name: plio
+channels:
+  - conda-forge
+  - usgs-astrogeology
+dependencies:
+  - numpy 
+  - pyproj 
+  - h5py 
+  - pvl 
+  - scipy 
+  - protobuf 
+  - affine 
+  - jinja2 
+  - networkx 
+  - pandas 
+  - sqlalchemy 
+  - pyyaml 
+  - ncurses 
+  - pytest 
+  - pytest-cov 
+  - sh 
+  - coveralls 
+  - nbsphinx