Commit 54180489 authored Oct 02, 2017 by Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !60

parents 0fdfab30 6743d9ad

_env_templates/atom_env.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@ dependencies:
		- flake8
		- flake8-docstrings
		- flake8-polyfill
		- git
		- git-lfs
		- pep8
		- pycodestyle
		- pydocstyle

_env_templates/ffmpeg.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -6,3 +6,4 @@ dependencies:
		- python=3
		- anaconda-client
		- ffmpeg
		- x264

_env_templates/monitoring.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ channels:
		- {willirath}
		- {anaconda}
		dependencies:
		- python=2.7.12
		- python=2.7
		- anaconda-client
		- basemap
		- cartopy

_env_templates/py2_pyngl.yml

+5 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ channels:
		- {willirath}
		- {anaconda}
		dependencies:
		- python=2.7.12
		- python=2.7
		- anaconda-client
		- aospy
		- basemap
		@@ -14,18 +14,21 @@ dependencies:
		- dask
		- eofs
		- fortran-magic
		- git
		- git-lfs
		- haversine
		- hdf5
		- ipython
		- jupyter
		- line_profiler
		- matplotlib=1.5.3
		- matplotlib
		- mtspec
		- nco
		- netCDF4=1.2.8
		- numpy
		- pandas
		- pyngl
		- pynio
		- pytables
		- seaborn
		- seawater

_env_templates/py2_std.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ dependencies:
		- dask
		- eofs
		- fortran-magic
		- git
		- git-lfs
		- haversine
		- hdf5
		- ipython