Skip to content

Commit 5febe16

Browse files
authored
Merge branch 'main' into docs/document-load-vs-open
2 parents 370d194 + ea76ec8 commit 5febe16

67 files changed

Lines changed: 1938 additions & 2225 deletions

Some content is hidden

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

.github/workflows/check_changelogs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
20+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2121
with:
2222
persist-credentials: false
2323

2424
- name: Install uv
25-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
25+
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
2626

2727
- name: Check zarr-python changelog entries
2828
run: uv run --no-sync python ci/check_changelog_entries.py

.github/workflows/codspeed.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
github.event_name == 'workflow_dispatch' ||
2424
(github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'benchmark'))
2525
steps:
26-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
26+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2727
with:
2828
fetch-depth: 0
2929
persist-credentials: false
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
version: '1.16.5'
3434
- name: Run the benchmarks
35-
uses: CodSpeedHQ/action@3194d9a39c4d46684cb44bf7207fc56626aad8fd # v4.15.1
35+
uses: CodSpeedHQ/action@9d332c4d90b43981c3e55ae8e38e68709996240f # v4.17.0
3636
with:
3737
mode: walltime
3838
run: hatch run test.py3.12-minimal:pytest tests/benchmarks --codspeed

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
name: Check docs
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2323
with:
2424
persist-credentials: false
25-
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
25+
- uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
2626
- run: uv sync --group docs
2727
# --strict turns warnings into errors, so a docs code block that fails to execute
2828
# at build time (e.g. a non-exec python fence disrupting a later exec="true" block)

.github/workflows/downstream.yml

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,56 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Check out zarr-python
24-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
24+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2525
with:
2626
fetch-depth: 0
2727
persist-credentials: false
2828

2929
- name: Check out xarray
30-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3131
with:
3232
repository: pydata/xarray
3333
path: xarray
3434
persist-credentials: false
3535

36-
- name: Set up pixi
37-
uses: prefix-dev/setup-pixi@5185adfbffb4bd703da3010310260805d89ebb11 # v0.9.6
36+
# We install xarray with plain pip/uv rather than pixi. pixi solves
37+
# xarray's entire manifest (it has no committed lockfile), which drags in
38+
# the `mypy-upstream` environment; that environment sources numcodecs from
39+
# git and fails to build under newer pixi with
40+
# `meson-python: error: Unknown option "pixi-conda-environment"`, breaking
41+
# the job before any test runs. Tests that need a backend we don't install
42+
# are skipped via xarray's `requires_*` markers, not failed.
43+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3844
with:
39-
manifest-path: xarray/pixi.toml
45+
python-version: '3.13'
46+
47+
- name: Install uv
48+
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
4049

41-
- name: Install zarr-python from branch
50+
- name: Install xarray and test dependencies
4251
working-directory: xarray
43-
run: pixi run -e test-py313 -- pip install --no-deps ..
52+
run: |
53+
uv venv
54+
# xarray's pytest tooling lives in the PEP 735 `dev` dependency group;
55+
# the zarr-relevant backends come from the `io` and `parallel` extras.
56+
uv pip install --group dev ".[io,parallel,accel]"
57+
58+
- name: Override zarr-python with branch version
59+
working-directory: xarray
60+
run: uv pip install --no-deps ..
4461

4562
- name: Show versions
4663
working-directory: xarray
4764
run: |
48-
pixi run -e test-py313 -- python -c "
65+
uv run python -c "
4966
import zarr; print(f'zarr {zarr.__version__}')
5067
import xarray; print(f'xarray {xarray.__version__}')
5168
"
5269
5370
- name: Run xarray zarr backend tests
5471
working-directory: xarray
5572
run: |
56-
pixi run -e test-py313 -- python -m pytest --no-header -q \
73+
uv run python -m pytest --no-header -q \
5774
xarray/tests/test_backends.py \
5875
xarray/tests/test_backends_api.py \
5976
xarray/tests/test_backends_datatree.py
@@ -66,13 +83,13 @@ jobs:
6683
runs-on: ubuntu-latest
6784
steps:
6885
- name: Check out zarr-python
69-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
86+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7087
with:
7188
fetch-depth: 0
7289
persist-credentials: false
7390

7491
- name: Check out numcodecs
75-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
92+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7693
with:
7794
repository: zarr-developers/numcodecs
7895
fetch-depth: 0
@@ -85,7 +102,7 @@ jobs:
85102
python-version: '3.13'
86103

87104
- name: Install uv
88-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
105+
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
89106

90107
- name: Install numcodecs with test-zarr-main group
91108
working-directory: numcodecs

.github/workflows/gpu_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
python-version: ['3.12']
3535

3636
steps:
37-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
37+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3838
with:
3939
fetch-depth: 0 # grab all branches and tags
4040
persist-credentials: false
@@ -62,7 +62,7 @@ jobs:
6262
python-version: ${{ matrix.python-version }}
6363
cache: 'pip'
6464
- name: Install uv
65-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
65+
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
6666
- name: Install Hatch
6767
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
6868
with:

.github/workflows/hypothesis.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
dependency-set: ["optional"]
4040

4141
steps:
42-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
42+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4343
with:
4444
persist-credentials: false
4545
- name: Set HYPOTHESIS_PROFILE based on trigger
@@ -57,7 +57,7 @@ jobs:
5757
python-version: ${{ matrix.python-version }}
5858
cache: 'pip'
5959
- name: Install uv
60-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
60+
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
6161
- name: Install Hatch
6262
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
6363
with:

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919
name: Lint
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2323
with:
2424
persist-credentials: false
2525
- name: Set up Python
2626
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
2727
with:
2828
python-version: "3.12"
2929
- name: Install uv
30-
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
30+
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
3131
with:
3232
enable-cache: true
3333
- uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4

.github/workflows/nightly_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
25+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2626
with:
2727
submodules: true
2828
fetch-depth: 0

.github/workflows/prepare_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
VERSION: ${{ inputs.version }}
3737
TARGET_BRANCH: ${{ inputs.target_branch }}
3838

39-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
39+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4040
with:
4141
ref: ${{ inputs.target_branch }}
4242
fetch-depth: 0

.github/workflows/releases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727

2828
steps:
29-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
29+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3030
with:
3131
submodules: true
3232
fetch-depth: 0

0 commit comments

Comments
 (0)