Skip to content

Commit bc8d2c2

Browse files
Merge branch 'v4-dev' into removing_applyconversion_from_vectorinterpolation
2 parents c311fba + 4330de3 commit bc8d2c2

File tree

106 files changed

+858
-1578
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+858
-1578
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/01_feature.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
name: 🔼 Parcels feature requests, and other enhancements
33
about: Suggest an improvement to the parcels codebase.
44
title: ""
5-
labels: ""
5+
labels: ["needs-triage"]
66
assignees: ""
77
---

.github/ISSUE_TEMPLATE/02_bug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "🐛 Bug Report"
22
description: Describe a bug in the parcels codebase. For support related to your specific use case, please post in Q&A in our Discussions tab.
3-
labels: ["bug"]
3+
labels: ["bug", "needs-triage"]
44
body:
55
- type: "input"
66
attributes:

.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/cache-pixi-lock.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
- uses: actions/checkout@v5
1818
with:
1919
fetch-depth: 0
20-
sparse-checkout: pixi.toml
2120
- name: Get current date
2221
id: date
2322
run: echo "date=$(date +'%Y-%m-%d')" >> "$GITHUB_OUTPUT"
@@ -30,7 +29,7 @@ jobs:
3029
- uses: prefix-dev/[email protected]
3130
if: ${{ !steps.restore.outputs.cache-hit }}
3231
with:
33-
pixi-version: v0.49.0
32+
pixi-version: v0.56.0
3433
run-install: false
3534
- name: Run pixi lock
3635
if: ${{ !steps.restore.outputs.cache-hit }}

.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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Profile.prof
2020
.eggs/*
2121
parcels.egg-info/*
2222
dist/parcels*.egg
23-
parcels/_version_setup.py
23+
src/parcels/_version_setup.py
2424
.pytest_cache
2525
.hypothesis
2626
.coverage
@@ -29,5 +29,8 @@ 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"

0 commit comments

Comments
 (0)