From 94b009e1a35127fccd0c60d0ee2708d0e8afb730 Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 24 Nov 2020 09:19:45 +0100 Subject: [PATCH 1/3] Bump c-blosc to 1.20.1 c-blosc --- c-blosc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c-blosc b/c-blosc index 9fae1c9a..a44e9614 160000 --- a/c-blosc +++ b/c-blosc @@ -1 +1 @@ -Subproject commit 9fae1c9acb659159321aca69aefcdbce663e2374 +Subproject commit a44e961498cdca2eb893fa897cd15dd007fad496 From 84909f1cd86be4173810c3b6bd6f05742b3e5de0 Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 24 Nov 2020 10:25:15 +0100 Subject: [PATCH 2/3] Deactivate SNAPPY --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 3cf27dbc..1d5bab17 100644 --- a/setup.py +++ b/setup.py @@ -77,9 +77,10 @@ def blosc_extension(): include_dirs += [d for d in glob('c-blosc/internal-complibs/*/*') if os.path.isdir(d)] define_macros += [('HAVE_LZ4', 1), - ('HAVE_SNAPPY', 1), ('HAVE_ZLIB', 1), - ('HAVE_ZSTD', 1)] + ('HAVE_ZSTD', 1), + ('DEACTIVATE_SNAPPY', 1), + ] # define_macros += [('CYTHON_TRACE', '1')] # SSE2 From eb859afd77feaf29d2a714aa7b11c1dbb993fb96 Mon Sep 17 00:00:00 2001 From: jmoore Date: Tue, 24 Nov 2020 12:46:47 +0100 Subject: [PATCH 3/3] Disable snappy tests --- numcodecs/tests/test_blosc.py | 10 +++++++--- tox.ini | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/numcodecs/tests/test_blosc.py b/numcodecs/tests/test_blosc.py index 168d5f2f..73caba9d 100644 --- a/numcodecs/tests/test_blosc.py +++ b/numcodecs/tests/test_blosc.py @@ -34,7 +34,7 @@ Blosc(cname='zlib', clevel=1, shuffle=0), Blosc(cname='zstd', clevel=1, shuffle=1), Blosc(cname='blosclz', clevel=1, shuffle=2), - Blosc(cname='snappy', clevel=1, shuffle=2), + # Blosc(cname='snappy', clevel=1, shuffle=2), Blosc(shuffle=Blosc.SHUFFLE, blocksize=0), Blosc(shuffle=Blosc.SHUFFLE, blocksize=2**8), Blosc(cname='lz4', clevel=1, shuffle=Blosc.NOSHUFFLE, blocksize=2**8), @@ -143,7 +143,7 @@ def test_compress_complib(use_threads): 'lz4': 'LZ4', 'lz4hc': 'LZ4', 'blosclz': 'BloscLZ', - 'snappy': 'Snappy', + # 'snappy': 'Snappy', 'zlib': 'Zlib', 'zstd': 'Zstd', } @@ -204,7 +204,11 @@ def test_config_blocksize(): def test_backwards_compatibility(): - check_backwards_compatibility(Blosc.codec_id, arrays, codecs) + try: + check_backwards_compatibility(Blosc.codec_id, arrays, codecs) + except Exception as e: + if "snappy" not in str(e): + raise def _encode_worker(data): diff --git a/tox.ini b/tox.ini index 8d5e6531..d165e060 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ setenv = commands = python setup.py build_ext --inplace py35,py36,py37: pytest -v --cov=numcodecs numcodecs - py38: pytest -v --cov=numcodecs --doctest-modules --doctest-glob=*.pyx numcodecs + py38: pytest -v --cov=numcodecs --doctest-modules --doctest-glob=*.pyx numcodecs -svx coverage report -m py38: flake8 numcodecs pip freeze