From 905a800ace200bbb30eef3ea3f099bad520ad7ad Mon Sep 17 00:00:00 2001 From: Valentin Haenel Date: Fri, 7 Aug 2020 17:42:14 +0200 Subject: [PATCH] adapt to python-blosc 1.9 --- test_cmdline/test_codec.cram | 2 +- test_cmdline/test_info.cram | 4 ++-- test_cmdline/test_metadata.cram | 2 +- test_cmdline/test_verbose_debug.cram | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test_cmdline/test_codec.cram b/test_cmdline/test_codec.cram index 6161c415..9c41474f 100644 --- a/test_cmdline/test_codec.cram +++ b/test_cmdline/test_codec.cram @@ -86,7 +86,7 @@ Try using an alternative codec ('lz4' should be available): blpk: 'offsets': blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re) blpk: First chunk blosc header: - blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 33), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 1048576), ('ctbytes', 129151)]) + blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 33), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 134215)]) blpk: First chunk blosc flags: blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'lz4')]) $ rm data.dat.blp diff --git a/test_cmdline/test_info.cram b/test_cmdline/test_info.cram index 89fe1c30..5e5fc361 100644 --- a/test_cmdline/test_info.cram +++ b/test_cmdline/test_info.cram @@ -30,7 +30,7 @@ Get some info on the file: blpk: 'offsets': blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re) blpk: First chunk blosc header: - blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 1048576), ('ctbytes', 136509)]) + blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 366674)]) blpk: First chunk blosc flags: blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')]) $ blpk i data.dat.blp @@ -47,7 +47,7 @@ Get some info on the file: blpk: 'offsets': blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re) blpk: First chunk blosc header: - blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 1048576), ('ctbytes', 136509)]) + blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 366674)]) blpk: First chunk blosc flags: blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')]) $ rm data.dat.blp diff --git a/test_cmdline/test_metadata.cram b/test_cmdline/test_metadata.cram index b51d3474..1dc86d5f 100644 --- a/test_cmdline/test_metadata.cram +++ b/test_cmdline/test_metadata.cram @@ -39,7 +39,7 @@ Add metadata to the file: blpk: meta_comp_size: 6[2-5]\.0B \(6[2-5]B\) (re) blpk: user_codec: b?'' (re) blpk: First chunk blosc header: - blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 1048576), ('ctbytes', 136509)]) + blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 366674)]) blpk: First chunk blosc flags: blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')]) $ blpk decompress data.dat.blp data.dat.dcmp diff --git a/test_cmdline/test_verbose_debug.cram b/test_cmdline/test_verbose_debug.cram index d6770e2d..732cfa2d 100644 --- a/test_cmdline/test_verbose_debug.cram +++ b/test_cmdline/test_verbose_debug.cram @@ -21,7 +21,7 @@ Get more information using --verbose: blpk: nchunks: 153 blpk: chunk_size: 1.0M (1048576B) blpk: last_chunk_size: 602.0K (616448B) - blpk: output file size: \d{1}\.[1-9]\d*M \([1-9]\d*B\) (re) + blpk: output file size: \d*\.[1-9]\d*M \([1-9]\d*B\) (re) blpk: compression ratio: [1-9]\d*\.\d+ (re) blpk: done $ blpk --verbose decompress data.dat.blp data.dat.dcmp @@ -29,7 +29,7 @@ Get more information using --verbose: blpk: getting ready for decompression blpk: input file is: 'data.dat.blp' blpk: output file is: 'data.dat.dcmp' - blpk: input file size: \d{1}\.[1-9]\d*M (re) + blpk: input file size: \d*\.[1-9]\d*M (re) blpk: output file size: 152.59M blpk: decompression ratio: [1-9]\d*.\d+ (re) blpk: done @@ -46,7 +46,7 @@ Get more information using --verbose, but with metadata: blpk: nchunks: 153 blpk: chunk_size: 1.0M (1048576B) blpk: last_chunk_size: 602.0K (616448B) - blpk: output file size: \d{1}\.[1-9]\d*M \([1-9]\d*B\) (re) + blpk: output file size: \d*\.[1-9]\d*M \([1-9]\d*B\) (re) blpk: compression ratio: [1-9]\d*\.\d+ (re) blpk: done $ blpk --verbose decompress data.dat.blp data.dat.dcmp @@ -54,7 +54,7 @@ Get more information using --verbose, but with metadata: blpk: getting ready for decompression blpk: input file is: 'data.dat.blp' blpk: output file is: 'data.dat.dcmp' - blpk: input file size: \d{1}\.[1-9]\d*M (re) + blpk: input file size: \d*\.[1-9]\d*M (re) blpk: read compressed metadata of size: '6[2-5]' (re) blpk: output file size: 152.59M blpk: decompression ratio: [1-9]\d*\.\d+ (re) @@ -146,7 +146,7 @@ Try using --debug blpk: getting ready for decompression blpk: input file is: 'data.dat.blp' blpk: output file is: 'data.dat.dcmp' - blpk: input file size: \d{1}\.[1-9]\d*M (re) + blpk: input file size: \d*\.[1-9]\d*M (re) blpk: reading bloscpack header blpk: bloscpack_header_raw: b?'.*' (re) blpk: bloscpack header: BloscpackHeader(format_version=3, offsets=True, metadata=False, checksum='adler32', typesize=8, chunk_size=52428800, last_chunk=2713600, nchunks=4, max_app_chunks=40)