diff --git a/.travis.yml b/.travis.yml index 618e0fac1285344e41c68185b544390d6c829015..90f2e834f3850227eafa0da81e11d529dabf2d3d 100644 --- 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 index b216503a4ca1c0db47628e268deae1834de5b463..653b3078295a64f73cef95a3d0f40da48683254b 100644 --- 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 \ No newline at end of file + - pytest-cov + - sh + - coveralls + - nbsphinx \ No newline at end of file diff --git a/environment_noGDAL.yml b/environment_noGDAL.yml new file mode 100644 index 0000000000000000000000000000000000000000..f8f2ee19a28732d04a01cb2553bcfee0dd873e6f --- /dev/null +++ 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 \ No newline at end of file