Commit 6743d9ad authored Oct 02, 2017 by Willi Rath

Merge branch 'unpin-py2712' into develop

parents e2c9eb0f e089cef2

_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

+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
		- aospy
		- basemap

_envs_hlrn/monitoring.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ channels:
		- file://home/b/shkifmwr/TM/data/conda_mirror/willirath_local_mirror/
		- file://home/b/shkifmwr/TM/data/conda_mirror/anaconda_local_mirror/
		dependencies:
		- python=2.7.12
		- python=2.7
		- anaconda-client
		- basemap
		- cartopy

_envs_hlrn/py2_pyngl.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ channels:
		- file://home/b/shkifmwr/TM/data/conda_mirror/willirath_local_mirror/
		- file://home/b/shkifmwr/TM/data/conda_mirror/anaconda_local_mirror/
		dependencies:
		- python=2.7.12
		- python=2.7
		- anaconda-client
		- aospy
		- basemap

_envs_nesh/monitoring.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@ channels:
		- https://conda.anaconda.org/willirath
		- https://repo.continuum.io/pkgs/free
		dependencies:
		- python=2.7.12
		- python=2.7
		- anaconda-client
		- basemap
		- cartopy