Merge branch 'develop' into 'master'

Develop

See merge request !60

_env_templates/atom_env.yml

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

_env_templates/ffmpeg.yml

@@ -6,3 +6,4 @@ dependencies:
   - python=3
   - anaconda-client
   - ffmpeg
+  - x264

_env_templates/monitoring.yml

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

_env_templates/py2_pyngl.yml

@@ -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

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

_env_templates/py3_std.yml

@@ -16,6 +16,8 @@ dependencies:
   - dask
   - eofs
   - fortran-magic
+  - git
+  - git-lfs
   - haversine
   - hdf5
   - ipython
@@ -23,7 +25,7 @@ dependencies:
   - iris-sample-data
   - jupyter
   - line_profiler
-  - matplotlib=1.5.3
+  - matplotlib
   - mtspec
   - nco
   - netCDF4=1.2.8

_env_templates/tm_deploy.yml

@@ -5,3 +5,5 @@ channels:
 dependencies:
   - python=3
   - cartopy
+  - git
+  - git-lfs

_envs_hlrn/atom_env.yml

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

_envs_hlrn/ffmpeg.yml

@@ -6,3 +6,4 @@ dependencies:
   - python=3
   - anaconda-client
   - ffmpeg
+  - x264

_envs_hlrn/monitoring.yml

@@ -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

@@ -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
@@ -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

_envs_hlrn/py2_std.yml

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

_envs_hlrn/py3_std.yml

@@ -16,6 +16,8 @@ dependencies:
   - dask
   - eofs
   - fortran-magic
+  - git
+  - git-lfs
   - haversine
   - hdf5
   - ipython
@@ -23,7 +25,7 @@ dependencies:
   - iris-sample-data
   - jupyter
   - line_profiler
-  - matplotlib=1.5.3
+  - matplotlib
   - mtspec
   - nco
   - netCDF4=1.2.8

_envs_hlrn/tm_deploy.yml

@@ -5,3 +5,5 @@ channels:
 dependencies:
   - python=3
   - cartopy
+  - git
+  - git-lfs

_envs_nesh/atom_env.yml

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

_envs_nesh/ffmpeg.yml

@@ -6,3 +6,4 @@ dependencies:
   - python=3
   - anaconda-client
   - ffmpeg
+  - x264

_envs_nesh/monitoring.yml

@@ -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

_envs_nesh/py2_pyngl.yml

@@ -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
   - 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

_envs_nesh/py2_std.yml

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

_envs_nesh/py3_std.yml

@@ -16,6 +16,8 @@ dependencies:
   - dask
   - eofs
   - fortran-magic
+  - git
+  - git-lfs
   - haversine
   - hdf5
   - ipython
@@ -23,7 +25,7 @@ dependencies:
   - iris-sample-data
   - jupyter
   - line_profiler
-  - matplotlib=1.5.3
+  - matplotlib
   - mtspec
   - nco
   - netCDF4=1.2.8

_envs_nesh/tm_deploy.yml

@@ -5,3 +5,5 @@ channels:
 dependencies:
   - python=3
   - cartopy
+  - git
+  - git-lfs

_envs_vulcanus/atom_env.yml

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

_envs_vulcanus/ffmpeg.yml

@@ -6,3 +6,4 @@ dependencies:
   - python=3
   - anaconda-client
   - ffmpeg
+  - x264

_envs_vulcanus/monitoring.yml

@@ -4,7 +4,7 @@ channels:
   - file://media/wrath/wrath_003/conda_mirror/willirath_local_mirror/
   - file://media/wrath/wrath_003/conda_mirror/anaconda_local_mirror/
 dependencies:
-  - python=2.7.12
+  - python=2.7
   - anaconda-client
   - basemap
   - cartopy

_envs_vulcanus/py2_pyngl.yml

@@ -4,7 +4,7 @@ channels:
   - file://media/wrath/wrath_003/conda_mirror/willirath_local_mirror/
   - file://media/wrath/wrath_003/conda_mirror/anaconda_local_mirror/
 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

_envs_vulcanus/py2_std.yml

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

_envs_vulcanus/py3_std.yml

@@ -16,6 +16,8 @@ dependencies:
   - dask
   - eofs
   - fortran-magic
+  - git
+  - git-lfs
   - haversine
   - hdf5
   - ipython
@@ -23,7 +25,7 @@ dependencies:
   - iris-sample-data
   - jupyter
   - line_profiler
-  - matplotlib=1.5.3
+  - matplotlib
   - mtspec
   - nco
   - netCDF4=1.2.8

_envs_vulcanus/tm_deploy.yml

@@ -5,3 +5,5 @@ channels:
 dependencies:
   - python=3
   - cartopy
+  - git
+  - git-lfs

envs/atom_env.yml

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

envs/ffmpeg.yml

@@ -6,3 +6,4 @@ dependencies:
   - python=3
   - anaconda-client
   - ffmpeg
+  - x264

envs/monitoring.yml

@@ -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

envs/py2_pyngl.yml

@@ -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
   - 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

envs/py2_std.yml

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

envs/py3_std.yml

@@ -16,6 +16,8 @@ dependencies:
   - dask
   - eofs
   - fortran-magic
+  - git
+  - git-lfs
   - haversine
   - hdf5
   - ipython
@@ -23,7 +25,7 @@ dependencies:
   - iris-sample-data
   - jupyter
   - line_profiler
-  - matplotlib=1.5.3
+  - matplotlib
   - mtspec
   - nco
   - netCDF4=1.2.8

envs/tm_deploy.yml

@@ -5,3 +5,5 @@ channels:
 dependencies:
   - python=3
   - cartopy
+  - git
+  - git-lfs