From e0d456874280340db5225e58d89d2552c8143d70 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 3 Mar 2025 07:21:37 -0500 Subject: [PATCH 1/6] No longer need to patch pyproject.toml to keep maturin from stripping binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We were failing to adjust profile.release.strip correctly anyway; it’s in Cargo.toml --- python-cramjam.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/python-cramjam.spec b/python-cramjam.spec index 1a226e6..87c6ceb 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -81,11 +81,6 @@ License: %{shrink: %prep %autosetup -n cramjam-%{srcversion} -# Do not strip the compiled Python module; we need useful debuginfo. Upstream -# set this intentionally, so this makes sense to keep downstream-only. -tomcli set pyproject.toml false 'tool.maturin.strip' -tomcli set pyproject.toml false 'profile.release.strip' - # Downstream-only: patch out the generate-import-lib feature, which is only # relevant on Windows, and which depends on the corresponding pyo3 feature – # which is not packaged for that reason. From af1aea506d6cead3afffe27ba3877ef8229a0e3f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 12 Mar 2025 09:36:45 -0400 Subject: [PATCH 2/6] =?UTF-8?q?Don=E2=80=99t=20need=20to=20manually=20expo?= =?UTF-8?q?rt=20RUSTFLAGS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [skip changelog] --- python-cramjam.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-cramjam.spec b/python-cramjam.spec index 87c6ceb..03867de 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -131,7 +131,6 @@ done %build -export RUSTFLAGS='%{build_rustflags}' %cargo_license_summary %{cargo_license} > LICENSES.dependencies %pyproject_wheel From 48e07eecc690f13c52e5dfbaef10661afa6d6217 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 8 Apr 2025 09:49:17 -0400 Subject: [PATCH 3/6] Expect maturin to handle license files --- python-cramjam.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-cramjam.spec b/python-cramjam.spec index 03867de..b1b4127 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -138,7 +138,7 @@ done %install %pyproject_install -%pyproject_save_files cramjam +%pyproject_save_files -l cramjam %check @@ -185,7 +185,6 @@ k="${k-}${k+ and }not test_variants_decompress_into" %files -n python3-cramjam -f %{pyproject_files} -%license LICENSE LICENSES.dependencies %doc README.md From 2015ea4d69d59c27b45042f68b8a8bdc00c5a342 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 8 Apr 2025 09:52:38 -0400 Subject: [PATCH 4/6] Add a tomcli version bound, matching F42+ [skip changelog] --- python-cramjam.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-cramjam.spec b/python-cramjam.spec index b1b4127..213383d 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -38,7 +38,7 @@ Source1: get_source Patch: %{url}/pull/196.patch BuildRequires: python3-devel -BuildRequires: tomcli +BuildRequires: tomcli >= 0.8.0 BuildRequires: cargo-rpm-macros >= 24 %if %{with tests} From 1c354a3120524bf723d7fbedaeec74c8421baa2b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 3 May 2025 23:04:59 -0400 Subject: [PATCH 5/6] Report and skip test that fails with miniz_oxide>0.8.5 --- python-cramjam.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/python-cramjam.spec b/python-cramjam.spec index 213383d..1133523 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -180,6 +180,11 @@ k="${k-}${k+ and }not (test_variants and [blosc2)" k="${k-}${k+ and }not test_variants_decompress_into" %endif +# Regression with miniz_oxide>0.8.5 +# https://github.com/milesgranger/cramjam/issues/211 +# Failed: DID NOT RAISE +k="${k-}${k+ and }not test_variants_raise_exception[deflate]" + %pytest -k "${k-}" -v -n auto %endif From 655812e7c95023b7c4bf5b2f75a00bcd13c4d4e7 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 4 May 2025 06:51:29 -0400 Subject: [PATCH 6/6] Remove conditional for F42+; the branches diverged --- python-cramjam.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/python-cramjam.spec b/python-cramjam.spec index 1133523..6e0c0db 100644 --- a/python-cramjam.spec +++ b/python-cramjam.spec @@ -167,19 +167,6 @@ k="${k-}${k+ and }not test_variants_different_dtypes[blosc2]" # https://github.com/milesgranger/cramjam/issues/190 k="${k-}${k+ and }not (test_variants and [blosc2)" -%if 0%{?fedora} > 41 -# Test failures in test_variants_decompress_into with recent hypothesis -# versions -# https://github.com/milesgranger/cramjam/issues/201 -# -# It is hard to be really sure what is going on here. The failures are -# concerning, and might (or might not) reflect a serious problem. Nevertheless, -# since the problem appears to be linked to newer hypothesis versions, there’s -# not reason to believe that the package has *new* problems. It *might* have -# newly *revealed* problems. This merits further investigation. -k="${k-}${k+ and }not test_variants_decompress_into" -%endif - # Regression with miniz_oxide>0.8.5 # https://github.com/milesgranger/cramjam/issues/211 # Failed: DID NOT RAISE