Skip to content

Commit 6315e13

Browse files
authored
Merge branch 'main' into use-zarr-metadata
2 parents 467cf27 + fe22910 commit 6315e13

25 files changed

Lines changed: 392 additions & 139 deletions

.github/workflows/docs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ jobs:
2424
persist-credentials: false
2525
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
2626
- run: uv sync --group docs
27-
- run: uv run mkdocs build
27+
# --strict turns warnings into errors, so a docs code block that fails to execute
28+
# at build time (e.g. a non-exec python fence disrupting a later exec="true" block)
29+
# fails CI instead of merging as a silent warning.
30+
- run: uv run mkdocs build --strict
2831
env:
2932
DISABLE_MKDOCS_2_WARNING: "true"
3033
NO_MKDOCS_2_WARNING: "true"

.github/workflows/downstream.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: Set up pixi
37-
uses: prefix-dev/setup-pixi@1b2de7f3351f171c8b4dfeb558c639cb58ed4ec0 # v0.9.5
37+
uses: prefix-dev/setup-pixi@5185adfbffb4bd703da3010310260805d89ebb11 # v0.9.6
3838
with:
3939
manifest-path: xarray/pixi.toml
4040

.github/workflows/gpu_test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212

1313
env:
1414
LD_LIBRARY_PATH: /usr/local/cuda/extras/CUPTI/lib64:/usr/local/cuda/lib64
15+
# Use the uv from astral-sh/setup-uv instead of hatch's bundled (pyapp) uv.
16+
HATCH_ENV_TYPE_VIRTUAL_UV_PATH: uv
1517

1618
permissions:
1719
contents: read
@@ -59,6 +61,8 @@ jobs:
5961
with:
6062
python-version: ${{ matrix.python-version }}
6163
cache: 'pip'
64+
- name: Install uv
65+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6266
- name: Install Hatch
6367
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
6468
with:
@@ -76,7 +80,7 @@ jobs:
7680
hatch env run --env "$HATCH_ENV" run-coverage
7781
7882
- name: Upload coverage
79-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
83+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
8084
with:
8185
token: ${{ secrets.CODECOV_TOKEN }}
8286
flags: gpu

.github/workflows/hypothesis.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ concurrency:
1818

1919
env:
2020
FORCE_COLOR: 3
21+
# Use the uv from astral-sh/setup-uv instead of hatch's bundled (pyapp) uv.
22+
HATCH_ENV_TYPE_VIRTUAL_UV_PATH: uv
2123

2224
jobs:
2325

@@ -55,6 +57,8 @@ jobs:
5557
with:
5658
python-version: ${{ matrix.python-version }}
5759
cache: 'pip'
60+
- name: Install uv
61+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
5862
- name: Install Hatch
5963
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
6064
with:
@@ -94,7 +98,7 @@ jobs:
9498
key: cache-hypothesis-${{ runner.os }}-${{ github.run_id }}
9599

96100
- name: Upload coverage
97-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
101+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
98102
with:
99103
token: ${{ secrets.CODECOV_TOKEN }}
100104
flags: tests

.github/workflows/issue-metrics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
3434
3535
- name: Run issue-metrics tool
36-
uses: github/issue-metrics@c9e9838147fd355dace335ba787f01b6641a400a # v4.2.2
36+
uses: github/issue-metrics@1e38d5e62363e14db8019ed7d106b9855bdba6cc # v4.2.7
3737
env:
3838
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3939
SEARCH_QUERY: 'repo:zarr-developers/zarr-python is:issue created:${{ env.last_month }} -reason:"not planned"'

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
3131
with:
3232
enable-cache: true
33-
- uses: j178/prek-action@6ad80277337ad479fe43bd70701c3f7f8aa74db3 # v2.0.3
33+
- uses: j178/prek-action@bdca6f102f98e2b4c7029491a53dfd366469e33d # v2.0.4

.github/workflows/test.yml

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
permissions:
1414
contents: read
1515

16+
env:
17+
# Use the uv from astral-sh/setup-uv; without an explicit path hatch
18+
# bootstraps its own (pyapp) uv, which fails on non-3.12 runners.
19+
HATCH_ENV_TYPE_VIRTUAL_UV_PATH: uv
20+
1621
concurrency:
1722
group: ${{ github.workflow }}-${{ github.ref }}
1823
cancel-in-progress: true
@@ -60,10 +65,10 @@ jobs:
6065
with:
6166
python-version: ${{ matrix.python-version }}
6267
cache: 'pip'
68+
- name: Install uv
69+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6370
- name: Install Hatch
64-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
65-
with:
66-
version: '1.16.5'
71+
run: python -m pip install hatch==1.16.5
6772
- name: Set Up Hatch Env
6873
env:
6974
HATCH_ENV: test.py${{ matrix.python-version }}-${{ matrix.dependency-set }}
@@ -78,7 +83,7 @@ jobs:
7883
hatch env run --env "$HATCH_ENV" run-coverage
7984
- name: Upload coverage
8085
if: ${{ matrix.dependency-set == 'optional' && matrix.os == 'ubuntu-latest' }}
81-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
86+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
8287
with:
8388
token: ${{ secrets.CODECOV_TOKEN }}
8489
flags: tests
@@ -109,10 +114,10 @@ jobs:
109114
with:
110115
python-version: ${{ matrix.python-version }}
111116
cache: 'pip'
117+
- name: Install uv
118+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
112119
- name: Install Hatch
113-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
114-
with:
115-
version: '1.16.5'
120+
run: python -m pip install hatch==1.16.5
116121
- name: Set Up Hatch Env
117122
env:
118123
HATCH_ENV: ${{ matrix.dependency-set }}
@@ -125,7 +130,7 @@ jobs:
125130
run: |
126131
hatch env run --env "$HATCH_ENV" run-coverage
127132
- name: Upload coverage
128-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
133+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
129134
with:
130135
token: ${{ secrets.CODECOV_TOKEN }}
131136
flags: tests
@@ -144,10 +149,10 @@ jobs:
144149
with:
145150
python-version: '3.13'
146151
cache: 'pip'
152+
- name: Install uv
153+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
147154
- name: Install Hatch
148-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
149-
with:
150-
version: '1.16.5'
155+
run: python -m pip install hatch==1.16.5
151156
- name: Set Up Hatch Env
152157
run: |
153158
hatch run doctest:pip list
@@ -168,10 +173,10 @@ jobs:
168173
with:
169174
python-version: '3.13'
170175
cache: 'pip'
176+
- name: Install uv
177+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
171178
- name: Install Hatch
172-
uses: pypa/hatch@257e27e51a6a5616ed08a39a408a21c35c9931bc
173-
with:
174-
version: '1.16.5'
179+
run: python -m pip install hatch==1.16.5
175180
- name: Run Benchmarks
176181
run: |
177182
hatch env run --env "test.py3.13-minimal" run-benchmark

.github/workflows/zarr-metadata-release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Build
3636
run: hatch build
3737

38-
- uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
38+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
3939
with:
4040
name: zarr-metadata-dist
4141
path: packages/zarr-metadata/dist
@@ -45,7 +45,7 @@ jobs:
4545
needs: [build]
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
48+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
4949
with:
5050
name: zarr-metadata-dist
5151
path: dist
@@ -76,7 +76,7 @@ jobs:
7676
id-token: write # required for OIDC trusted publishing
7777
attestations: write # required for artifact attestations
7878
steps:
79-
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
79+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
8080
with:
8181
name: zarr-metadata-dist
8282
path: dist
@@ -87,7 +87,7 @@ jobs:
8787
subject-path: dist/*
8888

8989
- name: Publish package to PyPI
90-
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
90+
uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
9191

9292
upload_testpypi:
9393
name: Upload to TestPyPI
@@ -101,7 +101,7 @@ jobs:
101101
id-token: write
102102
attestations: write
103103
steps:
104-
- uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
104+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
105105
with:
106106
name: zarr-metadata-dist
107107
path: dist
@@ -112,6 +112,6 @@ jobs:
112112
subject-path: dist/*
113113

114114
- name: Publish package to TestPyPI
115-
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
115+
uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # v1.14.0
116116
with:
117117
repository-url: https://test.pypi.org/legacy/

.github/workflows/zizmor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232
persist-credentials: false
3333

3434
- name: Run zizmor
35-
uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
35+
uses: zizmorcore/zizmor-action@5f14fd08f7cf1cb1609c1e344975f152c7ee938d # v0.5.6

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ default_language_version:
1515

1616
repos:
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.15.12
18+
rev: v0.15.15
1919
hooks:
2020
- id: ruff-check
2121
args: ["--fix", "--show-fixes"]
@@ -66,7 +66,7 @@ repos:
6666
pass_filenames: false
6767
files: ^pyproject\.toml$
6868
- repo: https://github.com/zizmorcore/zizmor-pre-commit
69-
rev: v1.24.1
69+
rev: v1.25.2
7070
hooks:
7171
- id: zizmor
7272
- repo: https://github.com/twisted/towncrier

0 commit comments

Comments
 (0)