Merge branch 'master' into develop

54fb092e · Willi Rath · 0616a687 · 1ac1ae7e · 54fb092e · 54fb092e
Commit 54fb092e authored Jan 09, 2018 by Willi Rath
10 changed files
--- a/_env_templates/py2_std.yml
+++ b/_env_templates/py2_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/_env_templates/py3_std.yml
+++ b/_env_templates/py3_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/_envs_hlrn/py2_std.yml
+++ b/_envs_hlrn/py2_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/_envs_hlrn/py3_std.yml
+++ b/_envs_hlrn/py3_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/_envs_nesh/py2_std.yml
+++ b/_envs_nesh/py2_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/_envs_nesh/py3_std.yml
+++ b/_envs_nesh/py3_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/_envs_vulcanus/py2_std.yml
+++ b/_envs_vulcanus/py2_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/_envs_vulcanus/py3_std.yml
+++ b/_envs_vulcanus/py3_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/envs/py2_std.yml
+++ b/envs/py2_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython

--- a/envs/py3_std.yml
+++ b/envs/py3_std.yml
@@ -18,6 +18,7 @@ dependencies:
  - fortran-magic
  - git
  - git-lfs
+  - gsw
  - haversine
  - hdf5
  - ipython