Commit 54180489 authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !60
parents 0fdfab30 6743d9ad
Pipeline #1053 passed with stage
in 32 minutes and 43 seconds
......@@ -9,6 +9,8 @@ dependencies:
- flake8
- flake8-docstrings
- flake8-polyfill
- git
- git-lfs
- pep8
- pycodestyle
- pydocstyle
......
......@@ -6,3 +6,4 @@ dependencies:
- python=3
- anaconda-client
- ffmpeg
- x264
......@@ -4,7 +4,7 @@ channels:
- {willirath}
- {anaconda}
dependencies:
- python=2.7.12
- python=2.7
- anaconda-client
- basemap
- cartopy
......
......@@ -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
......
......@@ -16,6 +16,8 @@ dependencies:
- dask
- eofs
- fortran-magic
- git
- git-lfs
- haversine
- hdf5
- ipython
......
......@@ -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
......
......@@ -5,3 +5,5 @@ channels:
dependencies:
- python=3
- cartopy
- git
- git-lfs
......@@ -9,6 +9,8 @@ dependencies:
- flake8
- flake8-docstrings
- flake8-polyfill
- git
- git-lfs
- pep8
- pycodestyle
- pydocstyle
......
......@@ -6,3 +6,4 @@ dependencies:
- python=3
- anaconda-client
- ffmpeg
- x264
......@@ -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
......
......@@ -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
......
......@@ -16,6 +16,8 @@ dependencies:
- dask
- eofs
- fortran-magic
- git
- git-lfs
- haversine
- hdf5
- ipython
......
......@@ -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
......
......@@ -5,3 +5,5 @@ channels:
dependencies:
- python=3
- cartopy
- git
- git-lfs
......@@ -9,6 +9,8 @@ dependencies:
- flake8
- flake8-docstrings
- flake8-polyfill
- git
- git-lfs
- pep8
- pycodestyle
- pydocstyle
......
......@@ -6,3 +6,4 @@ dependencies:
- python=3
- anaconda-client
- ffmpeg
- x264
......@@ -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
......
......@@ -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
......
......@@ -16,6 +16,8 @@ dependencies:
- dask
- eofs
- fortran-magic
- git
- git-lfs
- haversine
- hdf5
- ipython
......
......@@ -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
......
......@@ -5,3 +5,5 @@ channels:
dependencies:
- python=3
- cartopy
- git
- git-lfs
......@@ -9,6 +9,8 @@ dependencies:
- flake8
- flake8-docstrings
- flake8-polyfill
- git
- git-lfs
- pep8
- pycodestyle
- pydocstyle
......
......@@ -6,3 +6,4 @@ dependencies:
- python=3
- anaconda-client
- ffmpeg
- x264
......@@ -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
......
......@@ -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
......
......@@ -16,6 +16,8 @@ dependencies:
- dask
- eofs
- fortran-magic
- git
- git-lfs
- haversine
- hdf5
- ipython
......
......@@ -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
......
......@@ -5,3 +5,5 @@ channels:
dependencies:
- python=3
- cartopy
- git
- git-lfs
......@@ -9,6 +9,8 @@ dependencies:
- flake8
- flake8-docstrings
- flake8-polyfill
- git
- git-lfs
- pep8
- pycodestyle
- pydocstyle
......
......@@ -6,3 +6,4 @@ dependencies:
- python=3
- anaconda-client
- ffmpeg
- x264
......@@ -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
......
......@@ -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
......
......@@ -16,6 +16,8 @@ dependencies:
- dask
- eofs
- fortran-magic
- git
- git-lfs
- haversine
- hdf5
- ipython
......
......@@ -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
......
......@@ -5,3 +5,5 @@ channels:
dependencies:
- python=3
- cartopy
- git
- git-lfs
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment