Skip to content

Commit 328b228

Browse files
committed
Merge branch 'main' into obstore-getsize
2 parents 8a1642c + 9ae874c commit 328b228

Some content is hidden

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

46 files changed

+659
-460
lines changed

.github/workflows/hypothesis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787
&& steps.status.outcome == 'failure'
8888
&& github.event_name == 'schedule'
8989
&& github.repository_owner == 'zarr-developers'
90-
uses: xarray-contrib/issue-from-pytest-log@v1
90+
uses: scientific-python/issue-from-pytest-log-action@v1
9191
with:
9292
log-path: output-${{ matrix.python-version }}-log.jsonl
9393
issue-title: "Nightly Hypothesis tests failed"

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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/2819.chore.rst

Lines changed: 0 additions & 4 deletions
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/3138.feature.rst

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

changes/3140.bugfix.rst

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

changes/3156.bugfix.rst

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

0 commit comments

Comments
 (0)