Commit cbc492dd authored by Willi Rath's avatar Willi Rath

Merge branch 'develop' into 'master'

Use Parcels v1.0 conda-forge package

See merge request !66
parents 83928a41 b3322dd7
Pipeline #1312 canceled with stage
in 8 minutes and 29 seconds
...@@ -4,24 +4,7 @@ channels: ...@@ -4,24 +4,7 @@ channels:
- {anaconda} - {anaconda}
dependencies: dependencies:
- python=2.7 - python=2.7
- cachetools>=1.0.0 - basemap
- cgen - basemap-data-hires
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter - jupyter
- matplotlib=2.0.2 - parcels
- 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"
...@@ -4,24 +4,7 @@ channels: ...@@ -4,24 +4,7 @@ channels:
- file://home/b/shkifmwr/TM/data/conda_mirror/anaconda_local_mirror/ - file://home/b/shkifmwr/TM/data/conda_mirror/anaconda_local_mirror/
dependencies: dependencies:
- python=2.7 - python=2.7
- cachetools>=1.0.0 - basemap
- cgen - basemap-data-hires
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter - jupyter
- matplotlib=2.0.2 - parcels
- 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"
...@@ -4,24 +4,7 @@ channels: ...@@ -4,24 +4,7 @@ channels:
- https://repo.continuum.io/pkgs/free - https://repo.continuum.io/pkgs/free
dependencies: dependencies:
- python=2.7 - python=2.7
- cachetools>=1.0.0 - basemap
- cgen - basemap-data-hires
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter - jupyter
- matplotlib=2.0.2 - parcels
- 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"
...@@ -4,24 +4,7 @@ channels: ...@@ -4,24 +4,7 @@ channels:
- file://media/wrath/wrath_003/conda_mirror/anaconda_local_mirror/ - file://media/wrath/wrath_003/conda_mirror/anaconda_local_mirror/
dependencies: dependencies:
- python=2.7 - python=2.7
- cachetools>=1.0.0 - basemap
- cgen - basemap-data-hires
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter - jupyter
- matplotlib=2.0.2 - parcels
- 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"
...@@ -4,24 +4,7 @@ channels: ...@@ -4,24 +4,7 @@ channels:
- https://repo.continuum.io/pkgs/free - https://repo.continuum.io/pkgs/free
dependencies: dependencies:
- python=2.7 - python=2.7
- cachetools>=1.0.0 - basemap
- cgen - basemap-data-hires
- enum34
- ffmpeg
- flake8>=2.1.0
- gcc
- jupyter - jupyter
- matplotlib=2.0.2 - parcels
- 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"
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