From 087b9f9751ebd4baedcea4b3c2ba230ae829322c Mon Sep 17 00:00:00 2001
From: jay <jlaura@usgs.gov>
Date: Wed, 26 Sep 2018 10:11:20 -0700
Subject: [PATCH] Updates travis to use environment.yml
---
.travis.yml | 4 ++--
environment.yml | 9 ++++++---
environment_noGDAL.yml | 23 +++++++++++++++++++++++
3 files changed, 31 insertions(+), 5 deletions(-)
create mode 100644 environment_noGDAL.yml
diff --git a/.travis.yml b/.travis.yml
index 618e0fa..90f2e83 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 b216503..653b307 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 0000000..f8f2ee1
--- /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
--
GitLab