Skip to content

Commit b2c5043

Browse files
Merge branch 'v4-dev' into gsw_tutorial
2 parents 5b541c0 + 2588538 commit b2c5043

30 files changed

+114
-379
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
See https://docs.oceanparcels.org/en/latest/contributing.html
1+
See https://docs.parcels-code.org/en/latest/contributing.html

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
contact_links:
22
- name: 🙏 Parcels use question, help, or support
3-
url: https://github.com/OceanParcels/parcels/discussions/new?category=q-a
3+
url: https://github.com/Parcels-code/parcels/discussions/new?category=q-a
44
about: Have a question about Parcels? Or do you need troubleshooting for a specific usecase? Then start a Q&A Discussion thread instead, and we'll be happy to help.
55
- name: 💬 Other Parcels discussion
6-
url: https://github.com/OceanParcels/parcels/discussions
6+
url: https://github.com/Parcels-code/parcels/discussions
77
about: For general discussion about Parcels, or to share your work with the community, please use the Discussions tab.

.github/ci/recipe.yaml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,43 +29,35 @@ requirements:
2929
- wheel
3030
run:
3131
- python >=3.11
32-
- cftime
33-
- dask
34-
- matplotlib-base >=2.0.2
35-
- netcdf4 >=1.1.9
36-
- numpy >=1.11
37-
- platformdirs
38-
- pytest
39-
- scipy >=0.16.0
40-
- trajan
41-
- tqdm
42-
- xarray >=0.10.8
43-
- cf_xarray
44-
- xgcm
45-
- zarr >=2.11.0,!=2.18.0,<3
32+
- cftime >=1.6.3
33+
- dask >=2024.5.1
34+
- netcdf4 >=1.7.2
35+
- numpy >=2.1.0
36+
- tqdm >=4.50.0
37+
- xarray >=2024.5.0
38+
- cf_xarray >=0.8.6
39+
- xgcm >=0.9.0
40+
- zarr >=2.15.0,!=2.18.0,<3
4641
- uxarray>=2025.3.0
4742
- pyogrio # needed for geopandas (uxarray -> geoviews -> geopandas -> pyogrio, but for some reason conda doesn't pick it up automatically)
48-
- pooch
43+
- pooch >=1.8.0
4944

5045
tests:
5146
- python:
5247
imports:
5348
- parcels
5449

5550
about:
56-
homepage: https://github.com/OceanParcels/parcels
51+
homepage: https://github.com/Parcels-code/parcels
5752
license: MIT
5853
license_file: LICENSE.md
59-
summary: Probably A Really Computationally Efficient Lagrangian Simulator
54+
summary: Parcels - A highly customisable Lagrangian simulation framework
6055
description: |
61-
Parcels (Probably A Really Computationally Efficient Lagrangian Simulator)
62-
is a set of Python classes and methods to create customisable particle
63-
tracking simulations using output from Ocean Circulation models.
64-
Parcels can be used to track passive and active particulates such as
65-
water, nutrients, plankton, plastic and fish.
66-
documentation: https://oceanparcels.org/
67-
repository: https://github.com/OceanParcels/parcels
56+
Parcels provides a set of Python classes and methods to create customisable particle tracking simulations using gridded output from (ocean) circulation models.
57+
documentation: https://parcels-code.org/
58+
repository: https://github.com/Parcels-code/parcels
6859

6960
extra:
7061
recipe-maintainers:
7162
- VeckoTheGecko
63+
- erikvansebille

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
include:
3434
- os: ubuntu
3535
pixi-environment: "test-py311"
36+
- os: ubuntu
37+
pixi-environment: "test-minimum"
3638
steps:
3739
- uses: actions/checkout@v4
3840
- name: Restore cached pixi lockfile

.github/workflows/pypi-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
build-artifacts:
1313
runs-on: ubuntu-latest
14-
if: github.repository == 'OceanParcels/parcels'
14+
if: github.repository == 'Parcels-code/parcels'
1515
steps:
1616
- uses: actions/checkout@v4
1717
with:
@@ -102,5 +102,5 @@ jobs:
102102
channels: conda-forge
103103
- run: conda install -c conda-forge pip
104104
- run: pip install parcels --no-cache
105-
- run: curl https://raw.githubusercontent.com/OceanParcels/parcels/main/docs/examples/example_peninsula.py > example_peninsula.py
105+
- run: curl https://raw.githubusercontent.com/Parcels-code/parcels/main/docs/examples/example_peninsula.py > example_peninsula.py
106106
- run: python example_peninsula.py

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,8 @@ src/parcels/_version_setup.py
2929
.pixi
3030
*.egg-info
3131

32-
# Ignore pixi.lock file for now as Vecko is the only one using pixi for development. This should be checked into VCS if it becomes a more common tool.
32+
# Ignore pixi.lock file for this project. The con of 22k lines of noise it adds to diffs is not worth
33+
# the minor benefit of perfectly reproducible environments for all developers (and all the tooling that would
34+
# be required to support that - see https://github.com/pydata/xarray/issues/10732#issuecomment-3327780806
35+
# for more details)
3336
pixi.lock

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ authors:
1414
given-names: "Philippe"
1515
orcid: "https://orcid.org/0000-0003-0100-5834"
1616
- name: "The Parcels contributors"
17-
website: "https://github.com/OceanParcels/parcels/graphs/contributors"
17+
website: "https://github.com/Parcels-code/parcels/graphs/contributors"
1818
title: "Parcels"
1919
version: 3.1.2
2020
doi: 10.5281/zenodo.14845686
2121
date-released: 2025-02-10
22-
url: "https://github.com/OceanParcels/parcels"
22+
url: "https://github.com/Parcels-code/parcels"

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2019, OceanParcels team
3+
Copyright (c) 2025, Parcels team
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77
[![EffVer Versioning](https://img.shields.io/badge/version_scheme-EffVer-0097a7)](https://jacobtomlinson.dev/effver)
88
[![Xarray](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/pydata/xarray/refs/heads/main/doc/badge.json)](https://xarray.dev)
99
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
10-
[![unit-tests](https://github.com/OceanParcels/parcels/actions/workflows/ci.yml/badge.svg)](https://github.com/OceanParcels/parcels/actions/workflows/ci.yml)
11-
[![codecov](https://codecov.io/gh/OceanParcels/parcels/branch/main/graph/badge.svg)](https://codecov.io/gh/OceanParcels/parcels)
10+
[![unit-tests](https://github.com/Parcels-code/parcels/actions/workflows/ci.yml/badge.svg)](https://github.com/Parcels-code/parcels/actions/workflows/ci.yml)
11+
[![codecov](https://codecov.io/gh/Parcels-code/parcels/branch/main/graph/badge.svg)](https://codecov.io/gh/Parcels-code/parcels)
1212
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5353/badge)](https://bestpractices.coreinfrastructure.org/projects/5353)
13-
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/OceanParcels/parcels/main?labpath=docs%2Fexamples%2Fparcels_tutorial.ipynb)
13+
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/Parcels-code/parcels/main?labpath=docs%2Fexamples%2Fparcels_tutorial.ipynb)
1414
[![LinkedIn](https://custom-icon-badges.demolab.com/badge/LinkedIn-0A66C2?logo=linkedin-white&logoColor=fff)](https://www.linkedin.com/company/parcelscode/)
1515

1616
> [!WARNING]
1717
> This branch is `v4-dev` - version 4 of Parcels which is in active development. See `main` (or the tags) to browse stable versions of Parcels.
1818
19-
**Parcels** (**P**robably **A** **R**eally **C**omputationally **E**fficient **L**agrangian **S**imulator) is a set of Python classes and methods to create customisable particle tracking simulations using output from Ocean Circulation models. Parcels can be used to track passive and active particulates such as water, plankton, [plastic](http://www.topios.org/) and [fish](https://github.com/Jacketless/IKAMOANA).
19+
**Parcels** provides a set of Python classes and methods to create customisable particle tracking simulations using gridded output from (ocean) circulation models. Parcels can be used to track passive and active particulates such as water, plankton, [plastic](http://www.topios.org/) and [fish](https://github.com/Jacketless/IKAMOANA).
2020

21-
![Arctic-SO-medusaParticles](https://github.com/OceanParcels/oceanparcels_website/blob/main/images/homepage.gif)
21+
![Arctic-SO-medusaParticles](https://github.com/Parcels-code/oceanparcels_website/blob/main/images/homepage.gif)
2222

23-
_Animation of virtual particles carried by ocean surface flow in the global oceans. The particles are advected with [Parcels](http://oceanparcels.org/) in data from the [NEMO Ocean Model](https://www.nemo-ocean.eu/)._
23+
_Animation of virtual particles carried by ocean surface flow in the global oceans. The particles are advected with [Parcels](http://parcels-code.org/) in data from the [NEMO Ocean Model](https://www.nemo-ocean.eu/)._
2424

2525
### Parcels manuscript and code
2626

@@ -38,13 +38,13 @@ _Kehl, C, PD Nooteboom, MLA Kaandorp and E van Sebille (2023) Efficiently simula
3838

3939
### Further information
4040

41-
See [oceanparcels.org](http://oceanparcels.org/) for further information about [installing](https://docs.oceanparcels.org/en/latest/installation.html) and [running](https://docs.oceanparcels.org/en/latest/documentation.html) the Parcels code, as well as extended [documentation](https://docs.oceanparcels.org/en/latest/reference.html) of the methods and classes.
41+
See [parcels-code.org](http://parcels-code.org/) for further information about [installing](https://docs.parcels-code.org/en/latest/installation.html) and [running](https://docs.parcels-code.org/en/latest/documentation.html) the Parcels code, as well as extended [documentation](https://docs.parcels-code.org/en/latest/reference.html) of the methods and classes.
4242

4343
### Contributors
4444

45-
<a href="https://github.com/oceanparcels/parcels/graphs/contributors">
46-
<img src="https://contrib.rocks/image?repo=oceanparcels/parcels" />
45+
<a href="https://github.com/parcels-code/parcels/graphs/contributors">
46+
<img src="https://contrib.rocks/image?repo=parcels-code/parcels" />
4747
</a>
4848

49-
**All contributions are welcome! See the [contributing page](https://docs.oceanparcels.org/en/latest/contributing.html) in our documentation to see how to get involved.**
49+
**All contributions are welcome! See the [contributing page](https://docs.parcels-code.org/en/latest/contributing.html) in our documentation to see how to get involved.**
5050
Image made with [contrib.rocks](https://contrib.rocks).
32.9 KB
Loading

0 commit comments

Comments
 (0)