Skip to content

Switch to dev xgcm dependency, and add tuna devtool #2550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VeckoTheGecko merged 5 commits into from
Mar 19, 2026
Merged

Switch to dev xgcm dependency, and add tuna devtool #2550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1528b9
Add tuna to devtools feature
VeckoTheGecko Mar 18, 2026
47eb626
Switch xgcm dependency
VeckoTheGecko Mar 18, 2026
fcdba93
Update pixi.toml
VeckoTheGecko Mar 18, 2026
0b74194
Set `locked: false` in setup-pixi
VeckoTheGecko Mar 19, 2026
e05b229
Merge branch 'main' into import
VeckoTheGecko Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 5 additions & 2 deletions pixi.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" } # TODO Switch to main when import improvements are merged
cf_xarray = ">=0.8.6"
cftime = ">=1.6.3"
pooch = ">=1.8.0"
Expand All @@ -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.*"
Expand Down Expand Up @@ -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 = "*"
Expand Down
Loading