Commit 0b03330a authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into 'master'

Develop

See merge request !64
parents 1ac1ae7e 54fb092e
Pipeline #1296 passed with stage
in 30 minutes and 31 seconds
image: continuumio/miniconda3:latest
image: continuumio/miniconda3:4.3.27
variables:
DOCKER_DRIVER: overlay
......@@ -9,4 +9,4 @@ test:
- source activate root
- target_dir=${CONDA_PREFIX}
- shopt -s extglob
- ./update_anaconda.sh ${target_dir} envs/!(monitoring_gallery).yml
- ./update_anaconda.sh ${target_dir} envs/!(*@(monitoring_gallery|py2_parcels)).yml
......@@ -19,6 +19,6 @@ dependencies:
- numpy
- pandas
- seaborn
- xarray
- pip:
- "git+https://github.com/willirath/xarray.git@6f5e30f3a2f8ca907f0fd91bcd571e7d98027896#egg=xarray_wrath_allow_ploting_datetime"
- "git+{git_protocol}git.geomar.de/open-source/cartopy_offlinedata.git@master"
name: py2_parcels
channels:
- {conda-forge}
- {anaconda}
dependencies:
- python=2.7
- cachetools>=1.0.0
- cgen
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter
- matplotlib=2.0.2
- netcdf4>=1.1.9
- numpy>=1.9.1
- progressbar2
- py>=1.4.27
- pymbolic
- python-dateutil
- scipy>=0.16.0
- six>=1.10.0
- xarray>=0.5.1
- pip:
- pytest-ipynb
- pytest>=2.7.0
- "git+https://github.com/OceanParcels/parcels.git@master"
name: py2_pyngl
channels:
- {conda-forge}
- {willirath}
- {anaconda}
dependencies:
- python=2.7
- anaconda-client
- aospy
- basemap
- cartopy
- cf_units
- cmocean
- dask
- eofs
- fortran-magic
- git
- git-lfs
- gsw
- haversine
- hdf5
- ipython
- jupyter
- line_profiler
- matplotlib
- mtspec
- nco
- netCDF4=1.2.8
- numpy
- pandas
- pyngl
- pynio
- pytables
- seaborn
- seawater
- xarray
- pip:
- pymatlab
- "git+{git_protocol}git.geomar.de/open-source/cartopy_offlinedata.git@master"
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -19,6 +19,6 @@ dependencies:
- numpy
- pandas
- seaborn
- xarray
- pip:
- "git+https://github.com/willirath/xarray.git@6f5e30f3a2f8ca907f0fd91bcd571e7d98027896#egg=xarray_wrath_allow_ploting_datetime"
- "git+ssh://git@git.geomar.de/open-source/cartopy_offlinedata.git@master"
name: py2_parcels
channels:
- file://home/b/shkifmwr/TM/data/conda_mirror/conda-forge_local_mirror/
- file://home/b/shkifmwr/TM/data/conda_mirror/anaconda_local_mirror/
dependencies:
- python=2.7
- cachetools>=1.0.0
- cgen
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter
- matplotlib=2.0.2
- netcdf4>=1.1.9
- numpy>=1.9.1
- progressbar2
- py>=1.4.27
- pymbolic
- python-dateutil
- scipy>=0.16.0
- six>=1.10.0
- xarray>=0.5.1
- pip:
- pytest-ipynb
- pytest>=2.7.0
- "git+https://github.com/OceanParcels/parcels.git@master"
name: py2_pyngl
channels:
- file://home/b/shkifmwr/TM/data/conda_mirror/conda-forge_local_mirror/
- 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
- anaconda-client
- aospy
- basemap
- cartopy
- cf_units
- cmocean
- dask
- eofs
- fortran-magic
- git
- git-lfs
- gsw
- haversine
- hdf5
- ipython
- jupyter
- line_profiler
- matplotlib
- mtspec
- nco
- netCDF4=1.2.8
- numpy
- pandas
- pyngl
- pynio
- pytables
- seaborn
- seawater
- xarray
- pip:
- pymatlab
- "git+ssh://git@git.geomar.de/open-source/cartopy_offlinedata.git@master"
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -19,6 +19,6 @@ dependencies:
- numpy
- pandas
- seaborn
- xarray
- pip:
- "git+https://github.com/willirath/xarray.git@6f5e30f3a2f8ca907f0fd91bcd571e7d98027896#egg=xarray_wrath_allow_ploting_datetime"
- "git+ssh://git@git.geomar.de/open-source/cartopy_offlinedata.git@master"
name: py2_parcels
channels:
- https://conda.anaconda.org/conda-forge
- https://repo.continuum.io/pkgs/free
dependencies:
- python=2.7
- cachetools>=1.0.0
- cgen
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter
- matplotlib=2.0.2
- netcdf4>=1.1.9
- numpy>=1.9.1
- progressbar2
- py>=1.4.27
- pymbolic
- python-dateutil
- scipy>=0.16.0
- six>=1.10.0
- xarray>=0.5.1
- pip:
- pytest-ipynb
- pytest>=2.7.0
- "git+https://github.com/OceanParcels/parcels.git@master"
name: py2_pyngl
channels:
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/willirath
- https://repo.continuum.io/pkgs/free
dependencies:
- python=2.7
- anaconda-client
- aospy
- basemap
- cartopy
- cf_units
- cmocean
- dask
- eofs
- fortran-magic
- git
- git-lfs
- gsw
- haversine
- hdf5
- ipython
- jupyter
- line_profiler
- matplotlib
- mtspec
- nco
- netCDF4=1.2.8
- numpy
- pandas
- pyngl
- pynio
- pytables
- seaborn
- seawater
- xarray
- pip:
- pymatlab
- "git+ssh://git@git.geomar.de/open-source/cartopy_offlinedata.git@master"
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -19,6 +19,6 @@ dependencies:
- numpy
- pandas
- seaborn
- xarray
- pip:
- "git+https://github.com/willirath/xarray.git@6f5e30f3a2f8ca907f0fd91bcd571e7d98027896#egg=xarray_wrath_allow_ploting_datetime"
- "git+https://git.geomar.de/open-source/cartopy_offlinedata.git@master"
name: py2_parcels
channels:
- file://media/wrath/wrath_003/conda_mirror/conda-forge_local_mirror/
- file://media/wrath/wrath_003/conda_mirror/anaconda_local_mirror/
dependencies:
- python=2.7
- cachetools>=1.0.0
- cgen
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter
- matplotlib=2.0.2
- netcdf4>=1.1.9
- numpy>=1.9.1
- progressbar2
- py>=1.4.27
- pymbolic
- python-dateutil
- scipy>=0.16.0
- six>=1.10.0
- xarray>=0.5.1
- pip:
- pytest-ipynb
- pytest>=2.7.0
- "git+https://github.com/OceanParcels/parcels.git@master"
name: py2_pyngl
channels:
- file://media/wrath/wrath_003/conda_mirror/conda-forge_local_mirror/
- file://media/wrath/wrath_003/conda_mirror/willirath_local_mirror/
- file://media/wrath/wrath_003/conda_mirror/anaconda_local_mirror/
dependencies:
- python=2.7
- anaconda-client
- aospy
- basemap
- cartopy
- cf_units
- cmocean
- dask
- eofs
- fortran-magic
- git
- git-lfs
- gsw
- haversine
- hdf5
- ipython
- jupyter
- line_profiler
- matplotlib
- mtspec
- nco
- netCDF4=1.2.8
- numpy
- pandas
- pyngl
- pynio
- pytables
- seaborn
- seawater
- xarray
- pip:
- pymatlab
- "git+https://git.geomar.de/open-source/cartopy_offlinedata.git@master"
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -19,6 +19,6 @@ dependencies:
- numpy
- pandas
- seaborn
- xarray
- pip:
- "git+https://github.com/willirath/xarray.git@6f5e30f3a2f8ca907f0fd91bcd571e7d98027896#egg=xarray_wrath_allow_ploting_datetime"
- "git+https://git.geomar.de/open-source/cartopy_offlinedata.git@master"
name: py2_parcels
channels:
- https://conda.anaconda.org/conda-forge
- https://repo.continuum.io/pkgs/free
dependencies:
- python=2.7
- cachetools>=1.0.0
- cgen
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter
- matplotlib=2.0.2
- netcdf4>=1.1.9
- numpy>=1.9.1
- progressbar2
- py>=1.4.27
- pymbolic
- python-dateutil
- scipy>=0.16.0
- six>=1.10.0
- xarray>=0.5.1
- pip:
- pytest-ipynb
- pytest>=2.7.0
- "git+https://github.com/OceanParcels/parcels.git@master"
name: py2_pyngl
channels:
- https://conda.anaconda.org/conda-forge
- https://conda.anaconda.org/willirath
- https://repo.continuum.io/pkgs/free
dependencies:
- python=2.7
- anaconda-client
- aospy
- basemap
- cartopy
- cf_units
- cmocean
- dask
- eofs
- fortran-magic
- git
- git-lfs
- gsw
- haversine
- hdf5
- ipython
- jupyter
- line_profiler
- matplotlib
- mtspec
- nco
- netCDF4=1.2.8
- numpy
- pandas
- pyngl
- pynio
- pytables
- seaborn
- seawater
- xarray
- pip:
- pymatlab
- "git+https://git.geomar.de/open-source/cartopy_offlinedata.git@master"
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
......@@ -27,6 +27,7 @@ dependencies:
- jupyter
- line_profiler
- matplotlib
- memory_profiler
- mtspec
- nco
- netCDF4=1.2.8
......
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