Commit e4631b1b authored Sep 19, 2017 by Willi Rath

Merge branch 'develop' into 'master'

Add (python-)cdo and iris

See merge request !55

parents 7f6bc18b 2291dc49

_env_templates/py2_std.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cf_units
		- cmocean
		- dask
		@@ -18,6 +19,8 @@ dependencies:
		- haversine
		- hdf5
		- ipython
		- iris
		- iris-sample-data
		- jupyter
		- line_profiler
		- matplotlib
		@@ -27,6 +30,7 @@ dependencies:
		- numpy
		- pandas
		- pytables
		- python-cdo
		- seaborn
		- seawater
		- spyder

_env_templates/py3_std.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cf_units
		- cmocean
		- dask
		@@ -18,6 +19,8 @@ dependencies:
		- haversine
		- hdf5
		- ipython
		- iris
		- iris-sample-data
		- jupyter
		- line_profiler
		- matplotlib=1.5.3
		@@ -27,6 +30,7 @@ dependencies:
		- numpy
		- pandas
		- pytables
		- python-cdo
		- seaborn
		- seawater
		- spyder

_envs_hlrn/py2_std.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cf_units
		- cmocean
		- dask
		@@ -18,6 +19,8 @@ dependencies:
		- haversine
		- hdf5
		- ipython
		- iris
		- iris-sample-data
		- jupyter
		- line_profiler
		- matplotlib
		@@ -27,6 +30,7 @@ dependencies:
		- numpy
		- pandas
		- pytables
		- python-cdo
		- seaborn
		- seawater
		- spyder

_envs_hlrn/py3_std.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cf_units
		- cmocean
		- dask
		@@ -18,6 +19,8 @@ dependencies:
		- haversine
		- hdf5
		- ipython
		- iris
		- iris-sample-data
		- jupyter
		- line_profiler
		- matplotlib=1.5.3
		@@ -27,6 +30,7 @@ dependencies:
		- numpy
		- pandas
		- pytables
		- python-cdo
		- seaborn
		- seawater
		- spyder

_envs_nesh/py2_std.yml

+4 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ dependencies:
		- basemap
		- basemap-data-hires
		- cartopy
		- cdo
		- cf_units
		- cmocean
		- dask
		@@ -18,6 +19,8 @@ dependencies:
		- haversine
		- hdf5
		- ipython
		- iris
		- iris-sample-data
		- jupyter
		- line_profiler
		- matplotlib
		@@ -27,6 +30,7 @@ dependencies:
		- numpy
		- pandas
		- pytables
		- python-cdo
		- seaborn
		- seawater
		- spyder