Repository navigation
Conversation
…ONTEXT scope Add definitions for the extensions zarr-python writes. zarr-extensions registers `fixed_length_utf32` and the `vlen-utf8` and `vlen-bytes` codecs, so they join CORE_AND_EXTENSIONS_CONTEXT. zarr-python's own `null_terminated_bytes` and `variable_length_bytes`, which no specification registers, are only in the new ZARR_PYTHON_CONTEXT, so the default scope stays spec-pure. Rename CORE to CORE_CONTEXT and CORE_AND_EXTENSIONS to CORE_AND_EXTENSIONS_CONTEXT, so that a scope's name says it is a context. Fixes #423 Assisted-by: ClaudeCode:claude-opus-5-5
Assisted-by: ClaudeCode:claude-opus-5-5
Resolve the conflict in test_pipelines.py: keep the unclaimed `acme.vlen` codec, at the codec-level location zarr-developers#4574 gives a codec's chunk problems. Rename CORE to CORE_CONTEXT in main's new test_rule_locations.py, and move the expectations in test_zarr_python_scope.py to zarr-developers#4574's locations: a codec's chunk problem at the codec, a missing key at the object that lacks it. Assisted-by: ClaudeCode:claude-opus-5-5
Assisted-by: ClaudeCode:claude-opus-5-5
…ules Keep `CORE` and `CORE_AND_EXTENSIONS` importable from `zarr_metadata.v3` and `zarr_metadata.v3.definition` as the same scopes with a DeprecationWarning, so a consumer such as pydantic-zarr keeps working across the rename. Check that `vlen-utf8` encodes `string` and `vlen-bytes` encodes `bytes` (or zarr-python's `variable_length_bytes`), as zarr-extensions says, instead of accepting any data type whose values vary in size. Do not count trailing null bytes against the size of a `null_terminated_bytes` fill value, since they are padding. Spell a `fixed_length_utf32` fill value without its trailing U+0000 padding, so `"a"` and `"a\u0000"` have one canonical spelling. Assisted-by: ClaudeCode:claude-opus-5-5
Add zarr-python's `raw_bytes` data type (NumPy's `V`) to ZARR_PYTHON_CONTEXT, so the scope reads every data type zarr-python writes. Its names start with `ZarrPython`, since `RawBytes` already names the spec's raw bits. A fill value longer than `length_bytes` is a problem, because zarr-python cuts it short, and the canonical spelling pads it with null bytes, as zarr-python writes it. Rename CORE_V2 to CORE_V2_CONTEXT, so every scope's name ends in `_CONTEXT`. The old name keeps working with a DeprecationWarning, through the same `renamed_scope` helper as the v3 names, which moves to `zarr_metadata._renamed`. Share the base64 decoding and spelling of fill values in `_byte.py`, and say that the vlen codecs' `configuration` key is optional, since zarr-python writes an empty object. Assisted-by: ClaudeCode:claude-opus-5-5
Move CORE_V2_CONTEXT and its table of old names into `v2/_core.py`, as `v3/_core.py` holds the v3 scopes, so `zarr_metadata.v2` and `zarr_metadata.v2.definition` share one table. Say why a `fixed_length_utf32` fill value counts its trailing U+0000 code points, as the spec requires, while `null_terminated_bytes` follows zarr-python and does not, and test a value that only its padding makes too long. Assisted-by: ClaudeCode:claude-opus-5-5
… definitions The Hypothesis strategies merged from main (zarr-developers#4575) imported `CORE`, `CORE_AND_EXTENSIONS` and `CORE_V2` from modules that now hold only the `_CONTEXT` names, and their coverage test requires a strategy for every definition in `CORE_AND_EXTENSIONS_CONTEXT`. Rename the imports, and add strategies for `fixed_length_utf32`, `vlen-utf8` and `vlen-bytes`; each vlen codec draws nothing for a data type it does not read. Assisted-by: ClaudeCode:claude-opus-5-5
…strategies `DEFAULT_STRATEGIES` holds a strategy for each definition the package defines, but `null_terminated_bytes`, `variable_length_bytes` and `raw_bytes` had none, so `fields()` raised `LookupError` for them. Draw each, and check the strategies against `ZARR_PYTHON_CONTEXT`, which holds every definition. Say that the documents in test_zarr_python_scope.py leave out the compressors zarr-python adds. Assisted-by: ClaudeCode:claude-opus-5-5 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…IONS_CONTEXT The strategies are now checked against `ZARR_PYTHON_CONTEXT`, which no longer proves that `fixed_length_utf32`, `vlen-utf8` and `vlen-bytes` are in `CORE_AND_EXTENSIONS_CONTEXT`. Assert it directly. Assisted-by: ClaudeCode:claude-opus-5-5 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Each vlen codec strategy named its compatible data types a second time; draw nothing for exactly the chunks the codec's own chunk rules refuse, so the two cannot drift. Draw `fixed_length_utf32` fill values with trailing U+0000 padding too, which the canonical spelling removes. Assisted-by: ClaudeCode:claude-opus-5-5 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Main already holds this branch as zarr-developers#4583 (bc177b3, whose tree is this branch's tip), followed by later work such as the declaration rename in zarr-developers#4592. Every conflict therefore resolves to main's side, and the merged tree is main's. Assisted-by: ClaudeCode:claude-opus-5-5
Owner
Author
|
🤖 AI text below 🤖 This PR landed as zarr-developers#4583 (bc177b3 on main), whose tree matched this branch's tip. After the agent merged main into the branch, the diff against main is empty, so there is nothing left to merge here. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🤖 AI text below 🤖
Add the
ZARR_PYTHON_CONTEXTscope, which reads what zarr-python writes:CORE_AND_EXTENSIONS_CONTEXTplus zarr-python's own data typesnull_terminated_bytes(NumPy'sS) andvariable_length_bytes, which no specification registers.CORE_AND_EXTENSIONS_CONTEXTnow also reads thefixed_length_utf32data type (NumPy'sU) and thevlen-utf8andvlen-bytescodecs that zarr-extensions registers, so the strings zarr-python writes are checked instead of read as unclaimed.Rename the v3 scopes
COREandCORE_AND_EXTENSIONStoCORE_CONTEXTandCORE_AND_EXTENSIONS_CONTEXT, so that a scope's name says it is aZarrV3Context.Fixes #423
What the agent checked
The agent generated v3 metadata with zarr-python 3.4.2 for
<U3,S4,strandVariableLengthBytes()arrays. All four now read with no problem and no unclaimed field inZARR_PYTHON_CONTEXT. Before this change,CORE_AND_EXTENSIONSleft thestringarray'svlen-utf8codec unclaimed as well as the data types.fixed_length_utf32CORE_AND_EXTENSIONS_CONTEXTvlen-utf8,vlen-bytescodecsCORE_AND_EXTENSIONS_CONTEXTnull_terminated_bytesZARR_PYTHON_CONTEXTvariable_length_bytesZARR_PYTHON_CONTEXTRules the new definitions check:
length_bytesis a positive multiple of 4 forfixed_length_utf32, and at least 1 fornull_terminated_bytes.null_terminated_bytesfill value drops trailing null bytes.fixed_length_utf32is multi-byte, so thebytescodec requires anendian.vlen-*codecs reject a data type of fixed size. This uses the data type's declared storage, so it does not tellstringfrombytes: a name check would refuse zarr-python's ownvariable_length_bytes+vlen-bytespairing.Not covered
raw_bytes(NumPyV): its type names would collide with theRawBytes*names thatr*already exports at the top level.structuredalias that earlier zarr-python 3.x releases wrote.numcodecs.*codecs.CORE_V2keeps its name.just checkpasses on Python 3.11 and the newest supported version, including the strict docs build.🤖 Generated with Claude Code