Commit 2f3b13ab authored May 08, 2018 by Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !74

parents 704b0e76 39aa4231

_env_templates/py3_std.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

_envs_hlrn/py3_std.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

_envs_nesh/py3_std.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

_envs_vulcanus/py3_std.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

envs/py3_std.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -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