Skip to content

Commit 0529052

Browse files
Merge branch 'main' into push-opkypksroupl
2 parents 3957d7e + 79343ff commit 0529052

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/ci/recipe.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ requirements:
3535
- netcdf4 >=1.7.2
3636
- numpy >=2.1.0
3737
- tqdm >=4.50.0
38-
- xarray >=2025.8.0,<2026.4.0 # TODO: remove upper pin when https://github.com/UXARRAY/uxarray/issues/1490 is resolved
38+
- xarray >=2025.8.0
3939
- pandas >=2.2
4040
- pyarrow >=20.0.0
4141
- cf_xarray >=0.8.6
4242
- xgcm >=0.9.0
4343
- zarr >=3
44-
- uxarray>=2025.3.0
44+
- uxarray>=2026.04.1
4545
- pyogrio # needed for geopandas (uxarray -> geoviews -> geopandas -> pyogrio, but for some reason conda doesn't pick it up automatically)
4646
- holoviews >= 1.22.0 # https://github.com/prefix-dev/rattler-build/issues/2326
4747
- pooch >=1.8.0

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ repos:
1010
types: [text]
1111
files: \.(json|ipynb)$
1212
- repo: https://github.com/zizmorcore/zizmor-pre-commit
13-
rev: v1.23.1
13+
rev: v1.24.1
1414
hooks:
1515
- id: zizmor
1616
args: ["--offline"]
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.15.9
18+
rev: v0.15.12
1919
hooks:
2020
- id: ruff
2121
name: ruff lint (.py)
@@ -28,7 +28,7 @@ repos:
2828
- id: ruff-format
2929
types_or: [python, jupyter]
3030
- repo: https://github.com/rbubley/mirrors-prettier # Update mirror as official mirror is deprecated
31-
rev: v3.8.1
31+
rev: v3.8.3
3232
hooks:
3333
- id: prettier
3434

pixi.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ python = ">=3.11"
2323
netcdf4 = ">=1.6.0"
2424
numpy = ">=2.1.0"
2525
tqdm = ">=4.50.0"
26-
xarray = ">=2024.5.0,<2026.4.0" # TODO: remove upper pin when https://github.com/UXARRAY/uxarray/issues/1490 is resolved
26+
xarray = ">=2024.5.0"
2727
pandas = ">=2.2"
2828
pyarrow = ">=20.0.0"
2929
holoviews = ">=1.22.0" # https://github.com/prefix-dev/rattler-build/issues/2326
30-
uxarray = ">=2025.3.0"
30+
uxarray = ">=2026.04.1"
3131
dask = ">=2024.5.1"
3232
zarr = ">=3"
3333
xgcm = { git = "https://github.com/xgcm/xgcm", rev = "master" } # TODO: Switch to release version after release is cut
@@ -55,7 +55,7 @@ tqdm = "4.50.*"
5555
xarray = "2025.8.*"
5656
pandas = "2.2.*"
5757
pyarrow = "20.0.*"
58-
uxarray = "2025.3.*"
58+
uxarray = "2026.04.1"
5959
dask = "2024.6.*"
6060
zarr = "3.0.*"
6161
xgcm = { version = "0.9.*", channel = "conda-forge" }

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ dependencies = [
2626
"netCDF4 >=1.7.2",
2727
"zarr >=3",
2828
"tqdm >=4.50.0",
29-
"xarray >=2024.5.0,<2026.4.0", # TODO: remove upper pin when https://github.com/UXARRAY/uxarray/issues/1490 is resolved
29+
"xarray >=2024.5.0",
3030
"pandas >= 2.2",
3131
"pyarrow >=20.0.0",
32-
"uxarray >=2025.3.0",
32+
"uxarray >=2026.04.1",
3333
"pooch >=1.8.0",
3434
"xgcm >=0.9.0",
3535
"cf_xarray >=0.8.6",

0 commit comments

Comments
 (0)