Commit 3e44f5e5 authored Mar 14, 2018 by Willi Rath

Merge branch 'master' into 'develop'

Master

See merge request !72

parents 47ae49a6 704b0e76

_env_templates/py2_std.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cdo=1.8
		- cf_units
		- cmocean
		- dask

_env_templates/py3_std.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cdo=1.8
		- cf_units
		- cmocean
		- dask

_envs_hlrn/py2_std.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cdo=1.8
		- cf_units
		- cmocean
		- dask

_envs_hlrn/py3_std.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cdo=1.8
		- cf_units
		- cmocean
		- dask

_envs_nesh/py2_std.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cdo=1.8
		- cf_units
		- cmocean
		- dask