Merge branch 'develop' into 'master'

Develop See merge request !74

Merge branch 'develop' into 'master'
Develop See merge request !74
2f3b13ab · Willi Rath · 704b0e76 · 39aa4231 · 2f3b13ab · 2f3b13ab
Commit 2f3b13ab authored May 08, 2018 by Willi Rath
Showing with 10 additions and 0 deletions

py3_std.yml _env_templates/py3_std.yml +2 -0

py3_std.yml _envs_hlrn/py3_std.yml +2 -0

py3_std.yml _envs_nesh/py3_std.yml +2 -0

py3_std.yml _envs_vulcanus/py3_std.yml +2 -0

py3_std.yml envs/py3_std.yml +2 -0

No files found.
--- a/_env_templates/py3_std.yml
+++ b/_env_templates/py3_std.yml
@@ -14,6 +14,7 @@ dependencies:
  - cf_units
  - cmocean
  - dask
+  - distributed
  - eofs
  - fortran-magic
  - git
@@ -35,6 +36,7 @@ dependencies:
  - pandas
  - pytables
  - python-cdo
+  - scikit-learn
  - seaborn
  - seawater
  - spyder

--- a/_envs_hlrn/py3_std.yml
+++ b/_envs_hlrn/py3_std.yml
@@ -14,6 +14,7 @@ dependencies:
  - cf_units
  - cmocean
  - dask
+  - distributed
  - eofs
  - fortran-magic
  - git
@@ -35,6 +36,7 @@ dependencies:
  - pandas
  - pytables
  - python-cdo
+  - scikit-learn
  - seaborn
  - seawater
  - spyder

--- a/_envs_nesh/py3_std.yml
+++ b/_envs_nesh/py3_std.yml
@@ -14,6 +14,7 @@ dependencies:
  - cf_units
  - cmocean
  - dask
+  - distributed
  - eofs
  - fortran-magic
  - git
@@ -35,6 +36,7 @@ dependencies:
  - pandas
  - pytables
  - python-cdo
+  - scikit-learn
  - seaborn
  - seawater
  - spyder

--- a/_envs_vulcanus/py3_std.yml
+++ b/_envs_vulcanus/py3_std.yml
@@ -14,6 +14,7 @@ dependencies:
  - cf_units
  - cmocean
  - dask
+  - distributed
  - eofs
  - fortran-magic
  - git
@@ -35,6 +36,7 @@ dependencies:
  - pandas
  - pytables
  - python-cdo
+  - scikit-learn
  - seaborn
  - seawater
  - spyder

--- a/envs/py3_std.yml
+++ b/envs/py3_std.yml
@@ -14,6 +14,7 @@ dependencies:
  - cf_units
  - cmocean
  - dask
+  - distributed
  - eofs
  - fortran-magic
  - git
@@ -35,6 +36,7 @@ dependencies:
  - pandas
  - pytables
  - python-cdo
+  - scikit-learn
  - seaborn
  - seawater
  - spyder