diff --git a/_service b/_service index 7d79ed1..cf91bf0 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git @PARENT_TAG@ - v2.9.1 + v2.11.0 v(.*) \1 diff --git a/cramjam-2.11.0.tar.xz b/cramjam-2.11.0.tar.xz new file mode 100644 index 0000000..47a8123 --- /dev/null +++ b/cramjam-2.11.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c420c6c5d6d27df9c783869c8bf55971a03ecaf7684beea507a5ab15d1b8f0ce +size 56189840 diff --git a/cramjam-2.9.1.tar.xz b/cramjam-2.9.1.tar.xz deleted file mode 100644 index 578f27c..0000000 --- a/cramjam-2.9.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b52175262a350c7aa536bdd8e1b31574de6c6ce475e83cb4e0a56a438349a8bd -size 56142388 diff --git a/cramjam-issue193-test_variants.patch b/cramjam-issue193-test_variants.patch index 48a0295..58b4ea1 100644 --- a/cramjam-issue193-test_variants.patch +++ b/cramjam-issue193-test_variants.patch @@ -1,7 +1,7 @@ -Index: cramjam-2.9.1/tests/test_variants.py +Index: cramjam-2.11.0/tests/test_variants.py =================================================================== ---- cramjam-2.9.1.orig/tests/test_variants.py -+++ cramjam-2.9.1/tests/test_variants.py +--- cramjam-2.11.0.orig/tests/test_variants.py ++++ cramjam-2.11.0/tests/test_variants.py @@ -104,7 +104,7 @@ def test_variants_raise_exception(varian "output_type", (bytes, bytearray, "numpy", cramjam.Buffer, cramjam.File, memoryview) ) @@ -9,16 +9,20 @@ Index: cramjam-2.9.1/tests/test_variants.py -@given(raw_data=st.binary()) +@given(raw_data=st.binary(min_size=2)) def test_variants_compress_into( - variant_str, input_type, output_type, raw_data, tmp_path_factory, is_pypy - ): -@@ -174,13 +174,10 @@ def test_variants_compress_into( + variant_str, + input_type, +@@ -181,7 +181,7 @@ def test_variants_compress_into( "output_type", (bytes, bytearray, "numpy", cramjam.Buffer, cramjam.File, memoryview) ) @pytest.mark.parametrize("variant_str", VARIANTS) -@given(raw_data=st.binary()) +@given(raw_data=st.binary(min_size=2)) def test_variants_decompress_into( - variant_str, input_type, output_type, tmp_path_factory, raw_data, is_pypy + variant_str, + input_type, +@@ -191,9 +191,6 @@ def test_variants_decompress_into( + is_pypy, + is_free_threaded, ): - if variant_str == "izlib" and output_type == "memoryview": - pytest.skip("See issue https://github.com/milesgranger/cramjam/issues/193") diff --git a/cramjam-opensuse-config.patch b/cramjam-opensuse-config.patch index 20c5e15..abf6d85 100644 --- a/cramjam-opensuse-config.patch +++ b/cramjam-opensuse-config.patch @@ -1,29 +1,46 @@ ---- cramjam/pyproject.toml 2024-12-18 12:38:18.002576474 +0100 -+++ cramjam.patch/pyproject.toml 2024-12-18 14:11:22.834831651 +0100 -@@ -14,7 +14,25 @@ +Index: cramjam-2.11.0/pyproject.toml +=================================================================== +--- cramjam-2.11.0.orig/pyproject.toml ++++ cramjam-2.11.0/pyproject.toml +@@ -15,7 +15,26 @@ requires = ["maturin>=0.14"] build-backend = "maturin" [tool.maturin] -strip = true ++strip = false +no-default-features = true +features = [ -+ "extension-module", -+ "snappy", -+ "lz4", -+ "bzip2", -+ "brotli", -+ "zstd", -+ "xz-shared", -+ "igzip-shared", -+ "ideflate-shared", -+ "izlib-shared", -+ "use-system-isal-shared", -+ "gzip-shared", -+ "zlib-shared", -+ "deflate-shared", -+ "blosc2-shared", -+ "use-system-blosc2-shared" ++ "extension-module", ++ "snappy", ++ "lz4", ++ "bzip2", ++ "brotli", ++ "zstd", ++ "xz-shared", ++ "igzip-shared", ++ "ideflate-shared", ++ "izlib-shared", ++ "use-system-isal-shared", ++ "gzip-shared", ++ "zlib-shared", ++ "deflate-shared", ++# "blosc2-shared", ++# "use-system-blosc2-shared" +] - [project.optional-dependencies] + [dependency-groups] dev = [ +Index: cramjam-2.11.0/Cargo.toml +=================================================================== +--- cramjam-2.11.0.orig/Cargo.toml ++++ cramjam-2.11.0/Cargo.toml +@@ -79,7 +79,8 @@ libcramjam = { version = "^0.8", default + pyo3-build-config = "^0.25" + + [profile.release] +-strip = true ++strip = "none" ++debug = true + lto = "fat" + codegen-units = 1 + opt-level = 3 diff --git a/cramjam.obsinfo b/cramjam.obsinfo index 3ee3d44..934b978 100644 --- a/cramjam.obsinfo +++ b/cramjam.obsinfo @@ -1,4 +1,4 @@ name: cramjam -version: 2.9.1 -mtime: 1734006355 -commit: 6b30efc6ee36c80f7a4e1311cc8e9119905b03e0 +version: 2.11.0 +mtime: 1753648793 +commit: 1f411f3a05e5acf96ca8a632087916d5bf8b3500 diff --git a/python-cramjam.changes b/python-cramjam.changes index 996fb9c..02f654d 100644 --- a/python-cramjam.changes +++ b/python-cramjam.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Jan 2 16:11:13 UTC 2026 - Ben Greiner + +- Update to 2.11.0 + * Initial impl zero-copy Buffer by @milesgranger in #209 + * Buffer: Fix extended and negative int reads by @milesgranger in + #210 + * Initial Type/JavaScript support by @milesgranger in #217 + * Fix lz4.decompress_block_into w/o prepended size by + @milesgranger in #219 + * Add typing stub files and proper docs site by @milesgranger in + #220 + * Ban mutating immutable buffers on the free-threaded build by + @ngoldbaum in #214 + * zstd: store size by @milesgranger in #225 + * Add Python 3.14/t - Drop Python 3.8 by @milesgranger in #226 +- Release 2.10.0 + * Remove experimental codecs in default builds by @milesgranger + in #197 + * Bump libcramjam -> 0.7.0 by @milesgranger in #198 + * Update PyO3 to 0.24 by @musicinmybrain in #207 +- Disable test_variants_raise_exception[deflate] + * gh#milesgranger/cramjam#211 +- Disable blosc2 because it fails to compile right now and upstream + degraded it from the default feature set to experimental + * gh#milesgranger/cramjam#197 +- Add debuginfo + ------------------------------------------------------------------- Wed Dec 18 11:40:10 UTC 2024 - Ben Greiner @@ -85,7 +113,7 @@ Mon Feb 19 09:16:39 UTC 2024 - Atri Bhattacharya to run (about an hour). ------------------------------------------------------------------- -Fr- Jan 13 11:04:41 UTC 2023 - Ben Greiner +Fri Jan 13 11:04:41 UTC 2023 - Ben Greiner - Update to v2.6.2 * Bump pyo3, numpy and expand pyproject.toml by @milesgranger in diff --git a/python-cramjam.spec b/python-cramjam.spec index c027c90..73d3e6c 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -1,7 +1,7 @@ # # spec file for package python-cramjam # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ %define modname cramjam %{?sle15_python_module_pythons} Name: python-cramjam%{psuffix} -Version: 2.9.1 +Version: 2.11.0 Release: 0 Summary: Thin Python bindings to de/compression algorithms in Rust License: MIT @@ -50,14 +50,14 @@ BuildRequires: cmake BuildRequires: libtool BuildRequires: nasm BuildRequires: python-rpm-macros -BuildRequires: pkgconfig(blosc2) +# blosc2 disabled: see Patch0 and gh#milesgranger/cramjam#197 +#BuildRequires: pkgconfig(blosc2) BuildRequires: pkgconfig(libisal) BuildRequires: pkgconfig(libzstd) # SECTION test dependencies %if %{with test} BuildRequires: %{python_module %{modname} = %{version}} BuildRequires: %{python_module hypothesis} -BuildRequires: %{python_module memory_profiler} BuildRequires: %{python_module numpy} BuildRequires: %{python_module pytest-xdist} BuildRequires: %{python_module pytest} @@ -87,7 +87,9 @@ export ZSTD_SYS_USE_PKG_CONFIG=1 %check %if %{with test} -%pytest_arch -n auto --ignore benchmarks +# gh#milesgranger/cramjam#211 +donttest="(test_variants_raise_exception and deflate)" +%pytest_arch -n auto --ignore benchmarks -k "not ($donttest)" %endif %if %{without test} diff --git a/vendor.tar.xz b/vendor.tar.xz index d005f3b..a8c5e19 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:143bb6d8474ca2f4acbe2081bc4eb4b9e7458aafde700734f6abbb3deaf05d90 -size 19202980 +oid sha256:22880b5c4cb447b9e3068e4618840c904c7a70d587153114bd048cec2fcd243b +size 12499420