diff --git a/c-blosc b/c-blosc index 9fae1c9a..98aad98d 160000 --- a/c-blosc +++ b/c-blosc @@ -1 +1 @@ -Subproject commit 9fae1c9acb659159321aca69aefcdbce663e2374 +Subproject commit 98aad98d0fee2e4acccec78fbb19fb51e1107bf9 diff --git a/numcodecs/tests/common.py b/numcodecs/tests/common.py index e95c89c6..445849a1 100644 --- a/numcodecs/tests/common.py +++ b/numcodecs/tests/common.py @@ -261,6 +261,9 @@ def check_backwards_compatibility(codec_id, arrays, codecs, precision=None, pref for j, codec in enumerate(codecs): + if codec is None: + pytest.skip("codec has been removed") + # setup a directory to hold encoded data codec_dir = os.path.join(fixture_dir, 'codec.{:02d}'.format(j)) if not os.path.exists(codec_dir): # pragma: no cover diff --git a/numcodecs/tests/test_blosc.py b/numcodecs/tests/test_blosc.py index 168d5f2f..ceae4e06 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), + None, # was snappy Blosc(shuffle=Blosc.SHUFFLE, blocksize=0), Blosc(shuffle=Blosc.SHUFFLE, blocksize=2**8), Blosc(cname='lz4', clevel=1, shuffle=Blosc.NOSHUFFLE, blocksize=2**8), @@ -61,6 +61,11 @@ ] +def _skip_null(codec): + if codec is None: + pytest.skip("codec has been removed") + + @pytest.fixture(scope='module', params=[True, False, None]) def use_threads(request): return request.param @@ -69,6 +74,7 @@ def use_threads(request): @pytest.mark.parametrize('array', arrays) @pytest.mark.parametrize('codec', codecs) def test_encode_decode(array, codec): + _skip_null(codec) check_encode_decode(array, codec) @@ -77,6 +83,7 @@ def test_encode_decode(array, codec): else pytest.param(x, marks=[pytest.mark.xfail]) for x in arrays]) def test_partial_decode(codec, array): + _skip_null(codec) check_encode_decode_partial(array, codec) @@ -143,7 +150,6 @@ def test_compress_complib(use_threads): 'lz4': 'LZ4', 'lz4hc': 'LZ4', 'blosclz': 'BloscLZ', - 'snappy': 'Snappy', 'zlib': 'Zlib', 'zstd': 'Zstd', } @@ -257,6 +263,7 @@ def test_err_encode_object_buffer(): def test_decompression_error_handling(): for codec in codecs: + _skip_null(codec) with pytest.raises(RuntimeError): codec.decode(bytearray()) with pytest.raises(RuntimeError): @@ -265,5 +272,6 @@ def test_decompression_error_handling(): def test_max_buffer_size(): for codec in codecs: + _skip_null(codec) assert codec.max_buffer_size == 2**31 - 1 check_max_buffer_size(codec) diff --git a/setup.py b/setup.py index fc9c6996..c8622fd6 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,7 @@ 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_SNAPPY', 1), ('HAVE_ZLIB', 1), ('HAVE_ZSTD', 1)] # define_macros += [('CYTHON_TRACE', '1')]