From c1528b94cfebd33365803979d8c1a36ebe434792 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Wed, 18 Mar 2026 16:48:47 +0100 Subject: [PATCH 1/4] Add tuna to devtools feature --- pixi.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pixi.toml b/pixi.toml index 1e24524a9..e8e39824d 100644 --- a/pixi.toml +++ b/pixi.toml @@ -102,6 +102,9 @@ memray = "*" [feature.devtools.target.osx-arm64.dependencies] memray = "*" +[feature.devtools.pypi-dependencies] +tuna = ">=0.5.11" + [feature.docs.dependencies] parcels = { path = "." } numpydoc = "*" From 47eb6263089baafa9a8ee0287fc5818c20767750 Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Wed, 18 Mar 2026 16:53:58 +0100 Subject: [PATCH 2/4] Switch xgcm dependency Using an open PR that has improvements to the import mechanism --- pixi.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pixi.toml b/pixi.toml index e8e39824d..6b94b35af 100644 --- a/pixi.toml +++ b/pixi.toml @@ -27,7 +27,7 @@ holoviews = ">=1.22.0" # https://github.com/prefix-dev/rattler-build/issues/2326 uxarray = ">=2025.3.0" dask = ">=2024.5.1" zarr = ">=2.15.0,!=2.18.0,<3" -xgcm = ">=0.9.0" +xgcm = { git = "https://github.com/veckoTheGecko/xgcm", rev = "import" } # Switch to main when import improvements are merged cf_xarray = ">=0.8.6" cftime = ">=1.6.3" pooch = ">=1.8.0" @@ -54,7 +54,7 @@ xarray = "2024.5.*" uxarray = "2025.3.*" dask = "2024.5.*" zarr = "2.15.*" -xgcm = "0.9.*" +xgcm = { version = "0.9.*", channel = "conda-forge" } cf_xarray = "0.8.*" cftime = "1.6.*" pooch = "1.8.*" From fcdba93c5ff85d1d85b9bf9d85f8e8e3ff73ce25 Mon Sep 17 00:00:00 2001 From: Nick Hodgskin <36369090+VeckoTheGecko@users.noreply.github.com> Date: Wed, 18 Mar 2026 17:58:52 +0100 Subject: [PATCH 3/4] Update pixi.toml Co-authored-by: Erik van Sebille --- pixi.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pixi.toml b/pixi.toml index 6b94b35af..f0d226fed 100644 --- a/pixi.toml +++ b/pixi.toml @@ -27,7 +27,7 @@ holoviews = ">=1.22.0" # https://github.com/prefix-dev/rattler-build/issues/2326 uxarray = ">=2025.3.0" dask = ">=2024.5.1" zarr = ">=2.15.0,!=2.18.0,<3" -xgcm = { git = "https://github.com/veckoTheGecko/xgcm", rev = "import" } # Switch to main when import improvements are merged +xgcm = { git = "https://github.com/veckoTheGecko/xgcm", rev = "import" } # TODO Switch to main when import improvements are merged cf_xarray = ">=0.8.6" cftime = ">=1.6.3" pooch = ">=1.8.0" From 0b741941287626b85bc8ebb3441f0c64ea17877e Mon Sep 17 00:00:00 2001 From: Vecko <36369090+VeckoTheGecko@users.noreply.github.com> Date: Thu, 19 Mar 2026 09:52:10 +0100 Subject: [PATCH 4/4] Set `locked: false` in setup-pixi --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07288f86e..2c4a472e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,7 @@ jobs: - uses: prefix-dev/setup-pixi@v0.9.0 with: pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }} + locked: false # TODO: Remove once v7 of the lock file is removed, or once we stop having external source dependencies https://github.com/Parcels-code/Parcels/pull/2550#issuecomment-4088660238 cache: true cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }} # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache @@ -137,6 +138,7 @@ jobs: - uses: prefix-dev/setup-pixi@v0.9.0 with: pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }} + locked: false # TODO: Remove once v7 of the lock file is removed, or once we stop having external source dependencies https://github.com/Parcels-code/Parcels/pull/2550#issuecomment-4088660238 cache: true cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }} - name: Integration test @@ -180,6 +182,7 @@ jobs: - uses: prefix-dev/setup-pixi@v0.9.0 with: pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }} + locked: false # TODO: Remove once v7 of the lock file is removed, or once we stop having external source dependencies https://github.com/Parcels-code/Parcels/pull/2550#issuecomment-4088660238 cache: true cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }} - name: Typechecking @@ -202,6 +205,7 @@ jobs: - uses: prefix-dev/setup-pixi@v0.9.0 with: pixi-version: ${{ needs.cache-pixi-lock.outputs.pixi-version }} + locked: false # TODO: Remove once v7 of the lock file is removed, or once we stop having external source dependencies https://github.com/Parcels-code/Parcels/pull/2550#issuecomment-4088660238 cache: true cache-write: ${{ github.event_name == 'push' && github.ref_name == 'main' }} - name: Find the alpha version of Parcels