Skip to content

Don't overwrite codec config values when set. #700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 8, 2025
Merged

Don't overwrite codec config values when set. #700

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10e1158
Don't overwrite codec config values when set.
dcherian Feb 7, 2025
77e724b
little more
dcherian Feb 7, 2025
efa79a7
FIx test
dcherian Feb 7, 2025
8b012c7
fix test
dcherian Feb 7, 2025
56bc88d
Merge branch 'main' into dont-overwrite-codec-config
d-v-b Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions numcodecs/zarr3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@
super().__init__(**codec_config)

def evolve_from_array_spec(self, array_spec: ArraySpec) -> Shuffle:
if array_spec.dtype.itemsize != self.codec_config.get("elementsize"):
if self.codec_config.get("elementsize", None) is None:

Check warning on line 274 in numcodecs/zarr3.py

View check run for this annotation

Codecov / codecov/patch

numcodecs/zarr3.py#L274 

Added line #L274 was not covered by tests
return Shuffle(**{**self.codec_config, "elementsize": array_spec.dtype.itemsize})
return self # pragma: no cover

Expand Down Expand Up @@ -308,7 +308,7 @@
return chunk_spec

def evolve_from_array_spec(self, array_spec: ArraySpec) -> FixedScaleOffset:
if str(array_spec.dtype) != self.codec_config.get("dtype"):
if self.codec_config.get("dtype", None) is None:

Check warning on line 311 in numcodecs/zarr3.py

View check run for this annotation

Codecov / codecov/patch

numcodecs/zarr3.py#L311 

Added line #L311 was not covered by tests
return FixedScaleOffset(**{**self.codec_config, "dtype": str(array_spec.dtype)})
return self

Expand All @@ -321,7 +321,7 @@
super().__init__(**codec_config)

def evolve_from_array_spec(self, array_spec: ArraySpec) -> Quantize:
if str(array_spec.dtype) != self.codec_config.get("dtype"):
if self.codec_config.get("dtype", None) is None:

Check warning on line 324 in numcodecs/zarr3.py

View check run for this annotation

Codecov / codecov/patch

numcodecs/zarr3.py#L324 

Added line #L324 was not covered by tests
return Quantize(**{**self.codec_config, "dtype": str(array_spec.dtype)})
return self

Expand Down Expand Up @@ -356,8 +356,7 @@
return replace(chunk_spec, dtype=np.dtype(self.codec_config["encode_dtype"])) # type: ignore[arg-type]

def evolve_from_array_spec(self, array_spec: ArraySpec) -> AsType:
decode_dtype = self.codec_config.get("decode_dtype")
if str(array_spec.dtype) != decode_dtype:
if self.codec_config.get("decode_dtype", None) is None:

Check warning on line 359 in numcodecs/zarr3.py

View check run for this annotation

Codecov / codecov/patch

numcodecs/zarr3.py#L359 

Added line #L359 was not covered by tests
return AsType(**{**self.codec_config, "decode_dtype": str(array_spec.dtype)})
return self

Expand Down
Loading