Repository navigation
Commit c5097e2
committed
Fix ZarrAvgMerger under zarr 3.3: map chunks=True to auto-chunking
zarr 3.3 removed boolean chunk arguments, so ZarrAvgMerger's documented
default chunks=True raised ValueError on every construction. Map True to
None (zarr 3.3's spelling of auto-chunking) when zarr >= 3.3.0; the
substitution is version-gated because on zarr 3.0 None means a single
whole-shape chunk, not auto-chunking. chunks=False and explicit shapes
still work on every version and pass through unchanged.
zarr 3.3 also requires the bytes codec to specify endianness for
multi-byte dtypes, so the test fixtures' {"name": "bytes",
"configuration": {}} configs now set endian little; this form is
accepted from zarr 3.0 on.
Adds a regression test asserting the default produces auto-chunking
rather than one whole-shape chunk.
Verified with the full test_zarr_avg_merger suite on zarr 3.0.0, 3.2.0
and 3.3.0. The zarr 2 paths are untouched: the mapping is gated on the
zarr version, and the fixture change only affects v3-selected configs.
Signed-off-by: Dante Rigo <dhillrigo@gmail.com>1 parent 56f0bd9 commit c5097e2
2 files changed
Lines changed: 32 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
307 | 307 | | |
308 | 308 | | |
309 | 309 | | |
310 | | - | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
311 | 317 | | |
312 | 318 | | |
313 | 319 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
195 | 195 | | |
196 | 196 | | |
197 | 197 | | |
198 | | - | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
199 | 202 | | |
200 | | - | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
201 | 207 | | |
202 | | - | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
203 | 212 | | |
204 | 213 | | |
205 | 214 | | |
| |||
289 | 298 | | |
290 | 299 | | |
291 | 300 | | |
292 | | - | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
293 | 305 | | |
294 | 306 | | |
295 | 307 | | |
| |||
304 | 316 | | |
305 | 317 | | |
306 | 318 | | |
307 | | - | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
308 | 323 | | |
309 | 324 | | |
310 | 325 | | |
| |||
449 | 464 | | |
450 | 465 | | |
451 | 466 | | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
452 | 472 | | |
453 | 473 | | |
454 | 474 | | |
0 commit comments