Commit cbc492dd authored by Willi Rath's avatar Willi Rath
Browse files

Merge branch 'develop' into 'master' 

Use Parcels v1.0 conda-forge package

See merge request !66
parents 83928a41 b3322dd7

_env_templates/py2_parcels.yml

+3 −20
Original line number Diff line number Diff line
@@ -4,24 +4,7 @@ channels: 
  - {anaconda}

dependencies:

  - python=2.7

  - cachetools>=1.0.0

  - cgen

  - enum34

  - ffmpeg

  - flake8>=2.1.0

  - gcc

  - basemap

  - basemap-data-hires

  - 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"
 
  - parcels

_envs_hlrn/py2_parcels.yml

+3 −20
Original line number Diff line number Diff line
@@ -4,24 +4,7 @@ channels: 
  - 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

  - basemap

  - basemap-data-hires

  - 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"
 
  - parcels

_envs_nesh/py2_parcels.yml

+3 −20
Original line number Diff line number Diff line
@@ -4,24 +4,7 @@ channels: 
  - https://repo.continuum.io/pkgs/free

dependencies:

  - python=2.7

  - cachetools>=1.0.0

  - cgen

  - enum34

  - ffmpeg

  - flake8>=2.1.0

  - gcc

  - basemap

  - basemap-data-hires

  - 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"
 
  - parcels

_envs_vulcanus/py2_parcels.yml

+3 −20
Original line number Diff line number Diff line
@@ -4,24 +4,7 @@ channels: 
  - 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

  - basemap

  - basemap-data-hires

  - 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"
 
  - parcels

envs/py2_parcels.yml

+3 −20
Original line number Diff line number Diff line
@@ -4,24 +4,7 @@ channels: 
  - https://repo.continuum.io/pkgs/free

dependencies:

  - python=2.7

  - cachetools>=1.0.0

  - cgen

  - enum34

  - ffmpeg

  - flake8>=2.1.0

  - gcc

  - basemap

  - basemap-data-hires

  - 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"
 
  - parcels