Commit 4eec97c4 authored Jul 14, 2017 by Willi Rath

Merge branch 'develop' into 'master'

Disable non-functional texlive-core for now

See merge request !49

parents 9446ff6f 146e2bb5

_env_templates/py2_pyngl.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ dependencies:
		- pytables
		- seaborn
		- seawater
		- texlive-core
		- xarray
		- pip:
		- pymatlab

_env_templates/py2_std.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ dependencies:
		- seaborn
		- seawater
		- spyder
		- texlive-core
		- xarray
		- pip:
		- pymatlab

_env_templates/py3_std.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ dependencies:
		- seaborn
		- seawater
		- spyder
		- texlive-core
		- xarray
		- pip:
		- "git+{git_protocol}git.geomar.de/open-source/cartopy_offlinedata.git@master"

_envs_hlrn/py2_pyngl.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ dependencies:
		- pytables
		- seaborn
		- seawater
		- texlive-core
		- xarray
		- pip:
		- pymatlab

_envs_hlrn/py2_std.yml

+0 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ dependencies:
		- seaborn
		- seawater
		- spyder
		- texlive-core
		- xarray
		- pip:
		- pymatlab