From ce98dbd139f5d08907ac9c4dd238a950547d792b Mon Sep 17 00:00:00 2001 From: delandmeter Date: Thu, 11 Jul 2019 20:36:19 +0200 Subject: [PATCH 01/10] test binder setup --- binder/environment_py3_linux.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 binder/environment_py3_linux.yml diff --git a/binder/environment_py3_linux.yml b/binder/environment_py3_linux.yml new file mode 100644 index 0000000000..cb458f9e05 --- /dev/null +++ b/binder/environment_py3_linux.yml @@ -0,0 +1,28 @@ +name: py3_parcels +channels: + - defaults + - conda-forge +dependencies: + - python>=3.4 + - cachetools>=1.0.0 + - cgen + - coverage + - ffmpeg>=3.2.3,<3.2.6 + - flake8>=2.1.0 + - gcc_linux-64 + - git + - 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.10.8 + - cftime + - dask + - pytest<4.0 + - nbval From 69039a685a1fa2e321ffce2619b21780b89d88e8 Mon Sep 17 00:00:00 2001 From: delandmeter Date: Thu, 11 Jul 2019 20:38:16 +0200 Subject: [PATCH 02/10] rename env.yml file --- binder/{environment_py3_linux.yml => environment.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename binder/{environment_py3_linux.yml => environment.yml} (100%) diff --git a/binder/environment_py3_linux.yml b/binder/environment.yml similarity index 100% rename from binder/environment_py3_linux.yml rename to binder/environment.yml From 07fcd0f0f5ddea138c119220553f9f364b6c83f7 Mon Sep 17 00:00:00 2001 From: delandmeter Date: Thu, 11 Jul 2019 20:36:19 +0200 Subject: [PATCH 03/10] test binder setup --- binder/environment_py3_linux.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 binder/environment_py3_linux.yml diff --git a/binder/environment_py3_linux.yml b/binder/environment_py3_linux.yml new file mode 100644 index 0000000000..cb458f9e05 --- /dev/null +++ b/binder/environment_py3_linux.yml @@ -0,0 +1,28 @@ +name: py3_parcels +channels: + - defaults + - conda-forge +dependencies: + - python>=3.4 + - cachetools>=1.0.0 + - cgen + - coverage + - ffmpeg>=3.2.3,<3.2.6 + - flake8>=2.1.0 + - gcc_linux-64 + - git + - 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.10.8 + - cftime + - dask + - pytest<4.0 + - nbval From 416fe5cef4827b89c2496616a22df7377410248d Mon Sep 17 00:00:00 2001 From: delandmeter Date: Thu, 11 Jul 2019 20:38:16 +0200 Subject: [PATCH 04/10] rename env.yml file --- binder/{environment_py3_linux.yml => environment.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename binder/{environment_py3_linux.yml => environment.yml} (100%) diff --git a/binder/environment_py3_linux.yml b/binder/environment.yml similarity index 100% rename from binder/environment_py3_linux.yml rename to binder/environment.yml From b9c320b8d2168906c93e8b19ab42f5706b55befd Mon Sep 17 00:00:00 2001 From: delandmeter Date: Wed, 4 Sep 2019 14:57:30 +0200 Subject: [PATCH 05/10] update env.yml --- binder/environment.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/binder/environment.yml b/binder/environment.yml index cb458f9e05..d1a4b04ff2 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -6,11 +6,13 @@ dependencies: - python>=3.4 - cachetools>=1.0.0 - cgen + - clang_osx-64 - coverage - ffmpeg>=3.2.3,<3.2.6 - flake8>=2.1.0 - - gcc_linux-64 - git + - mpi4py>=3.0.1 + - mpich>=3.2.1 - jupyter - matplotlib>=2.0.2 - netcdf4>=1.1.9 @@ -20,9 +22,10 @@ dependencies: - pymbolic - python-dateutil - scipy>=0.16.0 - - six >=1.10.0 + - six>=1.10.0 - xarray>=0.10.8 - - cftime - dask + - cftime - pytest<4.0 - nbval + - scikit-learn From 6e64d5217f4838a623153b1019e72992c798ffab Mon Sep 17 00:00:00 2001 From: delandmeter Date: Wed, 4 Sep 2019 15:08:16 +0200 Subject: [PATCH 06/10] env should be the linux yml --- binder/environment.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/binder/environment.yml b/binder/environment.yml index d1a4b04ff2..f5979b189c 100644 --- a/binder/environment.yml +++ b/binder/environment.yml @@ -6,11 +6,11 @@ dependencies: - python>=3.4 - cachetools>=1.0.0 - cgen - - clang_osx-64 - coverage - ffmpeg>=3.2.3,<3.2.6 - flake8>=2.1.0 - git + - gcc_linux-64 - mpi4py>=3.0.1 - mpich>=3.2.1 - jupyter @@ -22,10 +22,10 @@ dependencies: - pymbolic - python-dateutil - scipy>=0.16.0 - - six>=1.10.0 + - six >=1.10.0 - xarray>=0.10.8 - - dask - cftime + - dask - pytest<4.0 - nbval - scikit-learn From 5c414b87f39c59a710d148666e2527db0bcd01c4 Mon Sep 17 00:00:00 2001 From: delandmeter Date: Wed, 4 Sep 2019 15:11:53 +0200 Subject: [PATCH 07/10] add binder link in readme --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index d88af6302a..edeece809c 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,8 @@ The manuscript detailing the first release of Parcels, version 0.9, has been pub ### Further information See [oceanparcels.org](http://oceanparcels.org/) for further information about [installing](http://oceanparcels.org/#installing) and [running](http://oceanparcels.org/#tutorials) the Parcels code, as well as extended [documentation](http://oceanparcels.org/gh-pages/html/) of the methods and classes. + + +### Pangeo Binder example + +[![Binder](https://binder.pangeo.io/badge_logo.svg)](https://binder.pangeo.io/v2/gh/OceanParcels/parcels/binder_branch) From 923ff3f513aba38a5c161569c30c85715882531b Mon Sep 17 00:00:00 2001 From: delandmeter Date: Wed, 4 Sep 2019 16:55:56 +0200 Subject: [PATCH 08/10] linking to oceanparcels/parcels_examples_binder --- README.md | 4 ++-- binder/environment.yml | 31 ------------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 binder/environment.yml diff --git a/README.md b/README.md index edeece809c..1e834ff1de 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,6 @@ The manuscript detailing the first release of Parcels, version 0.9, has been pub See [oceanparcels.org](http://oceanparcels.org/) for further information about [installing](http://oceanparcels.org/#installing) and [running](http://oceanparcels.org/#tutorials) the Parcels code, as well as extended [documentation](http://oceanparcels.org/gh-pages/html/) of the methods and classes. -### Pangeo Binder example +### Launch Parcels Tutorials on Pangeo Binder -[![Binder](https://binder.pangeo.io/badge_logo.svg)](https://binder.pangeo.io/v2/gh/OceanParcels/parcels/binder_branch) +[![Binder](https://binder.pangeo.io/badge_logo.svg)](https://binder.pangeo.io/v2/gh/OceanParcels/parcels_examples_binder/master?urlpath=lab/tree/parcels_examples/parcels_tutorial.ipynb) diff --git a/binder/environment.yml b/binder/environment.yml deleted file mode 100644 index f5979b189c..0000000000 --- a/binder/environment.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: py3_parcels -channels: - - defaults - - conda-forge -dependencies: - - python>=3.4 - - cachetools>=1.0.0 - - cgen - - coverage - - ffmpeg>=3.2.3,<3.2.6 - - flake8>=2.1.0 - - git - - gcc_linux-64 - - mpi4py>=3.0.1 - - mpich>=3.2.1 - - 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.10.8 - - cftime - - dask - - pytest<4.0 - - nbval - - scikit-learn From b78c717fff6dd4e328a6bcc959df8ec2c155f90b Mon Sep 17 00:00:00 2001 From: delandmeter Date: Thu, 5 Sep 2019 09:53:38 +0200 Subject: [PATCH 09/10] Pangeo binder -> mybinder --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1e834ff1de..3dc9caf72b 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,6 @@ The manuscript detailing the first release of Parcels, version 0.9, has been pub See [oceanparcels.org](http://oceanparcels.org/) for further information about [installing](http://oceanparcels.org/#installing) and [running](http://oceanparcels.org/#tutorials) the Parcels code, as well as extended [documentation](http://oceanparcels.org/gh-pages/html/) of the methods and classes. -### Launch Parcels Tutorials on Pangeo Binder +### Launch Parcels Tutorials on mybinder.org -[![Binder](https://binder.pangeo.io/badge_logo.svg)](https://binder.pangeo.io/v2/gh/OceanParcels/parcels_examples_binder/master?urlpath=lab/tree/parcels_examples/parcels_tutorial.ipynb) +[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/OceanParcels/parcels_examples_binder/master?urlpath=lab/tree/parcels_examples/parcels_tutorial.ipynb) From 326eea9005a29cbc370ccda4dc67d2e40ff271b0 Mon Sep 17 00:00:00 2001 From: Erik van Sebille Date: Fri, 6 Sep 2019 10:05:46 +0200 Subject: [PATCH 10/10] Adding more badges to readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3dc9caf72b..6efff37e6b 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,6 @@ See [oceanparcels.org](http://oceanparcels.org/) for further information about [ ### Launch Parcels Tutorials on mybinder.org [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/OceanParcels/parcels_examples_binder/master?urlpath=lab/tree/parcels_examples/parcels_tutorial.ipynb) +[![Travis-ci](https://travis-ci.org/OceanParcels/parcels.svg?branch=master)](https://travis-ci.org/OceanParcels/parcels) +[![Anaconda-release](https://anaconda.org/conda-forge/parcels/badges/version.svg)](https://anaconda.org/conda-forge/parcels/) +[![Anaconda-date](https://anaconda.org/conda-forge/parcels/badges/latest_release_date.svg)](https://anaconda.org/conda-forge/parcels/)