@@ -278,35 +278,49 @@ def test_to_dict():
278278 codec = numcodecs .zarr3 .LZ4 (level = 5 )
279279 assert codec .to_dict () == {"name" : "numcodecs.lz4" , "configuration" : {"level" : 5 }}
280280
281- @pytest .mark .parametrize (("codec_v2" , "expected_v3_cls" ),[
282- (numcodecs .BZ2 (), numcodecs .zarr3 .BZ2 ),
283- (numcodecs .CRC32 (), numcodecs .zarr3 .CRC32 ),
284- (numcodecs .CRC32C (), numcodecs .zarr3 .CRC32C ),
285- (numcodecs .LZ4 (), numcodecs .zarr3 .LZ4 ),
286- (numcodecs .LZMA (), numcodecs .zarr3 .LZMA ),
287- (numcodecs .ZFPY (), numcodecs .zarr3 .ZFPY ),
288- (numcodecs .Adler32 (), numcodecs .zarr3 .Adler32 ),
289- (numcodecs .AsType (encode_dtype = np .float64 ,decode_dtype = np .float32 ), numcodecs .zarr3 .AsType ),
290- (numcodecs .BitRound (keepbits = 10 ), numcodecs .zarr3 .BitRound ),
291- (numcodecs .Blosc (), numcodecs .zarr3 .Blosc ),
292- (numcodecs .Delta (dtype = np .float64 ), numcodecs .zarr3 .Delta ),
293- (numcodecs .FixedScaleOffset (offset = 1000 , scale = 10 , dtype = 'f8' , astype = 'u1' ), numcodecs .zarr3 .FixedScaleOffset ),
294- (numcodecs .Fletcher32 (), numcodecs .zarr3 .Fletcher32 ),
295- (numcodecs .GZip (), numcodecs .zarr3 .GZip ),
296- (numcodecs .JenkinsLookup3 (), numcodecs .zarr3 .JenkinsLookup3 ),
297- (numcodecs .PCodec (), numcodecs .zarr3 .PCodec ),
298- (numcodecs .PackBits (), numcodecs .zarr3 .PackBits ),
299- (numcodecs .Quantize (digits = 1 , dtype = 'f8' ), numcodecs .zarr3 .Quantize ),
300- (numcodecs .Shuffle (), numcodecs .zarr3 .Shuffle ),
301- (numcodecs .Zlib (), numcodecs .zarr3 .Zlib ),
302- (numcodecs .Zstd (), numcodecs .zarr3 .Zstd ),
303- ])
281+
282+ @pytest .mark .parametrize (
283+ ("codec_v2" , "expected_v3_cls" ),
284+ [
285+ (numcodecs .BZ2 (), numcodecs .zarr3 .BZ2 ),
286+ (numcodecs .CRC32 (), numcodecs .zarr3 .CRC32 ),
287+ (numcodecs .CRC32C (), numcodecs .zarr3 .CRC32C ),
288+ (numcodecs .LZ4 (), numcodecs .zarr3 .LZ4 ),
289+ (numcodecs .LZMA (), numcodecs .zarr3 .LZMA ),
290+ (numcodecs .ZFPY (), numcodecs .zarr3 .ZFPY ),
291+ (numcodecs .Adler32 (), numcodecs .zarr3 .Adler32 ),
292+ (
293+ numcodecs .AsType (encode_dtype = np .float64 , decode_dtype = np .float32 ),
294+ numcodecs .zarr3 .AsType ,
295+ ),
296+ (numcodecs .BitRound (keepbits = 10 ), numcodecs .zarr3 .BitRound ),
297+ (numcodecs .Blosc (), numcodecs .zarr3 .Blosc ),
298+ (numcodecs .Delta (dtype = np .float64 ), numcodecs .zarr3 .Delta ),
299+ (
300+ numcodecs .FixedScaleOffset (offset = 1000 , scale = 10 , dtype = 'f8' , astype = 'u1' ),
301+ numcodecs .zarr3 .FixedScaleOffset ,
302+ ),
303+ (numcodecs .Fletcher32 (), numcodecs .zarr3 .Fletcher32 ),
304+ (numcodecs .GZip (), numcodecs .zarr3 .GZip ),
305+ (numcodecs .JenkinsLookup3 (), numcodecs .zarr3 .JenkinsLookup3 ),
306+ (numcodecs .PCodec (), numcodecs .zarr3 .PCodec ),
307+ (numcodecs .PackBits (), numcodecs .zarr3 .PackBits ),
308+ (numcodecs .Quantize (digits = 1 , dtype = 'f8' ), numcodecs .zarr3 .Quantize ),
309+ (numcodecs .Shuffle (), numcodecs .zarr3 .Shuffle ),
310+ (numcodecs .Zlib (), numcodecs .zarr3 .Zlib ),
311+ (numcodecs .Zstd (), numcodecs .zarr3 .Zstd ),
312+ ],
313+ )
304314def test_cast_numcodecs_to_v3 (store : Store , codec_v2 , expected_v3_cls ) -> None :
305315 result_v3 = numcodecs .zarr3 .to_zarr3 (codec_v2 )
306316
307317 assert result_v3 .__class__ == expected_v3_cls
308318 assert result_v3 .codec_config == codec_v2 .get_config ()
309319
320+ from zarr .abc .codec import Codec
321+
322+ codec_args : dict [str , Codec ]
323+
310324 if issubclass (expected_v3_cls , numcodecs .zarr3 ._NumcodecsArrayArrayCodec ):
311325 codec_args = {"filters" : [result_v3 ]}
312326 elif issubclass (expected_v3_cls , numcodecs .zarr3 ._NumcodecsArrayBytesCodec ):
@@ -315,11 +329,5 @@ def test_cast_numcodecs_to_v3(store: Store, codec_v2, expected_v3_cls) -> None:
315329 codec_args = {"compressors" : [result_v3 ]}
316330 else :
317331 raise TypeError (f"unsupported type: { expected_v3_cls } " )
318- zarr .create_array (
319- store ,
320- shape = (64 ,),
321- chunks = (64 ,),
322- dtype = np .bool ,
323- fill_value = 0 ,
324- ** codec_args
325- )
332+
333+ zarr .create_array (store , shape = (64 ,), chunks = (64 ,), dtype = np .bool , fill_value = 0 , ** codec_args )
0 commit comments