Commit 2f3016a4 authored Sep 19, 2017 by Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !57

parents e4631b1b 2f14d4a5

_env_templates/monitoring.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ dependencies:
	- jupyter		- jupyter
	- matplotlib=1.5.3		- matplotlib=1.5.3
	- nco		- nco
	- netCDF4		- netCDF4=1.2.8
	- numpy		- numpy
	- pandas		- pandas
	- seaborn		- seaborn

_envs_hlrn/monitoring.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ dependencies:
	- jupyter		- jupyter
	- matplotlib=1.5.3		- matplotlib=1.5.3
	- nco		- nco
	- netCDF4		- netCDF4=1.2.8
	- numpy		- numpy
	- pandas		- pandas
	- seaborn		- seaborn

_envs_nesh/monitoring.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ dependencies:
	- jupyter		- jupyter
	- matplotlib=1.5.3		- matplotlib=1.5.3
	- nco		- nco
	- netCDF4		- netCDF4=1.2.8
	- numpy		- numpy
	- pandas		- pandas
	- seaborn		- seaborn

_envs_vulcanus/monitoring.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ dependencies:
	- jupyter		- jupyter
	- matplotlib=1.5.3		- matplotlib=1.5.3
	- nco		- nco
	- netCDF4		- netCDF4=1.2.8
	- numpy		- numpy
	- pandas		- pandas
	- seaborn		- seaborn

envs/monitoring.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ dependencies:
	- jupyter		- jupyter
	- matplotlib=1.5.3		- matplotlib=1.5.3
	- nco		- nco
	- netCDF4		- netCDF4=1.2.8
	- numpy		- numpy
	- pandas		- pandas
	- seaborn		- seaborn