Skip to content

Commit c7ddb0e

Browse files
authored
Merge branch 'main' into coalesce-shard-reads
2 parents c65cf82 + abbdbf2 commit c7ddb0e

Some content is hidden

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

74 files changed

+1068
-672
lines changed

.github/ISSUE_TEMPLATE/release-checklist.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ assignees: ''
2525
- [ ] All tests pass in the ["GPU Tests" workflow](https://github.com/zarr-developers/zarr-python/actions/workflows/gpu_test.yml).
2626
- [ ] All tests pass in the ["Hypothesis" workflow](https://github.com/zarr-developers/zarr-python/actions/workflows/hypothesis.yaml).
2727
- [ ] Check that downstream libraries work well (maintainers can make executive decisions about whether all checks are required for this release).
28+
- [ ] numcodecs
2829
- [ ] Xarray (@jhamman @dcherian @TomNicholas)
2930
- Zarr's upstream compatibility is tested via the [Upstream Dev CI worklow](https://github.com/pydata/xarray/actions/workflows/upstream-dev-ci.yaml).
3031
- Click on the most recent workflow and check that the `upstream-dev` job has run and passed. `upstream-dev` is not run on all all workflow runs.

.github/workflows/hypothesis.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
name: Slow Hypothesis CI
22
on:
33
push:
4-
branches:
5-
- "main"
4+
branches: [main, 3.0.x]
65
pull_request:
7-
branches:
8-
- "main"
6+
branches: [main, 3.0.x]
97
types: [opened, reopened, synchronize, labeled]
108
schedule:
119
- cron: "0 0 * * *" # Daily “At 00:00” UTC
@@ -89,7 +87,7 @@ jobs:
8987
&& steps.status.outcome == 'failure'
9088
&& github.event_name == 'schedule'
9189
&& github.repository_owner == 'zarr-developers'
92-
uses: xarray-contrib/issue-from-pytest-log@v1
90+
uses: scientific-python/issue-from-pytest-log-action@v1
9391
with:
9492
log-path: output-${{ matrix.python-version }}-log.jsonl
9593
issue-title: "Nightly Hypothesis tests failed"

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Test
55

66
on:
77
push:
8-
branches: [ main ]
8+
branches: [ main, 3.0.x ]
99
pull_request:
10-
branches: [ main ]
10+
branches: [ main, 3.0.x ]
1111
workflow_dispatch:
1212

1313
concurrency:
@@ -21,20 +21,20 @@ jobs:
2121
strategy:
2222
matrix:
2323
python-version: ['3.11', '3.12', '3.13']
24-
numpy-version: ['1.25', '2.2']
24+
numpy-version: ['1.26', '2.2']
2525
dependency-set: ["minimal", "optional"]
2626
os: ["ubuntu-latest"]
2727
include:
2828
- python-version: '3.11'
29-
numpy-version: '1.25'
29+
numpy-version: '1.26'
3030
dependency-set: 'optional'
3131
os: 'macos-latest'
3232
- python-version: '3.13'
3333
numpy-version: '2.2'
3434
dependency-set: 'optional'
3535
os: 'macos-latest'
3636
- python-version: '3.11'
37-
numpy-version: '1.25'
37+
numpy-version: '1.26'
3838
dependency-set: 'optional'
3939
os: 'windows-latest'
4040
- python-version: '3.13'

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ repos:
4949
- id: rst-directive-colons
5050
- id: rst-inline-touching-normal
5151
- repo: https://github.com/numpy/numpydoc
52-
rev: v1.8.0
52+
rev: v1.9.0
5353
hooks:
5454
- id: numpydoc-validation
5555
- repo: https://github.com/twisted/towncrier

changes/+c563f4d4.bugfix.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Register 'gpu' marker with pytest for downstream StoreTests.

changes/2774.feature.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/2871.feature.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

changes/2874.feature.rst

Lines changed: 0 additions & 9 deletions
This file was deleted.

changes/2921.bugfix.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

changes/3021.feature.rst

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)