Skip to content

Commit 6979b5d

Browse files
authored
Merge branch 'main' into add_utils_noexcept
2 parents 52e74ba + ad1ad67 commit 6979b5d

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
run: |
7979
conda activate env
8080
# TODO: remove --pre option when zarr v3 is out
81-
python -m pip install --pre zarr
81+
python -m pip install --pre zarr>=3.0.0b2
8282
8383
# This is used to test with zfpy, which does not yet support numpy 2.0
8484
- name: Install older numpy and zfpy

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ repos:
3131
hooks:
3232
- id: mypy
3333
args: [--config-file, pyproject.toml]
34-
additional_dependencies: [numpy, pytest, zfpy, 'zarr==3.0.0b1']
34+
additional_dependencies: [numpy, pytest, zfpy, 'zarr>=3.0.0b2']

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ build:
99
python: "3.12"
1010
jobs:
1111
post_install:
12-
- python -m pip install --pre 'zarr'
12+
- python -m pip install --pre 'zarr>=3.0.0b2'
1313

1414
sphinx:
1515
configuration: docs/conf.py

docs/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Contributing to NumCodecs
2-
=========================
1+
Contributing
2+
============
33

44
NumCodecs is a community maintained project. We welcome contributions in the form of bug
55
reports, bug fixes, documentation, enhancement proposals and more. This page provides

numcodecs/checksum32.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from .compat import ensure_contiguous_ndarray, ndarray_copy
1010
from .jenkins import jenkins_lookup3
1111

12-
if TYPE_CHECKING:
12+
if TYPE_CHECKING: # pragma: no cover
1313
from typing_extensions import Buffer
1414

1515
CHECKSUM_LOCATION = Literal['start', 'end']

numcodecs/tests/test_zarr3.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import numpy as np
66
import pytest
77

8-
if not TYPE_CHECKING:
9-
zarr = pytest.importorskip("zarr")
10-
else:
8+
if TYPE_CHECKING: # pragma: no cover
119
import zarr
10+
else:
11+
zarr = pytest.importorskip("zarr")
1212

1313
import zarr.storage
1414
from zarr.core.common import JSON
@@ -36,7 +36,7 @@
3636

3737
@pytest.fixture
3838
def store() -> StorePath:
39-
return StorePath(MemoryStore(mode="w"))
39+
return StorePath(MemoryStore(read_only=False))
4040

4141

4242
ALL_CODECS = [getattr(numcodecs.zarr3, cls_name) for cls_name in numcodecs.zarr3.__all__]

0 commit comments

Comments
 (0)