Skip to content

Commit 9949654

Browse files
authored
undo parameter renaming for compatibility with n5-blosc (#485)
fix compatibility with n5-blosc * n5-blosc expects the original blosc parameters including 'blocksize' * add release-comment about n5-blosc patch
1 parent 5385484 commit 9949654

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

docs/release.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ Upcoming Release
1414
* Upgrade dependencies in the test matrices and resolve a
1515
compatibility issue with testing against the Azure Storage
1616
Emulator. By :user:`alimanfoo`; :issue:`468`, :issue:`467`.
17+
18+
* Do not rename Blosc parameters in n5 backend and add `blocksize` parameter,
19+
compatible with n5-blosc.
1720

1821
.. _release_2.3.2:
1922

zarr/n5.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,10 @@ def compressor_config_to_n5(compressor_config):
416416
RuntimeWarning
417417
)
418418

419-
n5_config['codec'] = compressor_config['cname']
420-
n5_config['level'] = compressor_config['clevel']
419+
n5_config['cname'] = compressor_config['cname']
420+
n5_config['clevel'] = compressor_config['clevel']
421421
n5_config['shuffle'] = compressor_config['shuffle']
422-
assert compressor_config['blocksize'] == 0, \
423-
"blosc block size needs to be 0 for N5 containers."
422+
n5_config['blocksize'] = compressor_config['blocksize']
424423

425424
elif codec_id == 'lzma':
426425

@@ -475,10 +474,10 @@ def compressor_config_to_zarr(compressor_config):
475474

476475
elif codec_id == 'blosc':
477476

478-
zarr_config['cname'] = compressor_config['codec']
479-
zarr_config['clevel'] = compressor_config['level']
477+
zarr_config['cname'] = compressor_config['cname']
478+
zarr_config['clevel'] = compressor_config['clevel']
480479
zarr_config['shuffle'] = compressor_config['shuffle']
481-
zarr_config['blocksize'] = 0
480+
zarr_config['blocksize'] = compressor_config['blocksize']
482481

483482
elif codec_id == 'lzma':
484483

0 commit comments

Comments
 (0)