From 61264846cd93d14fd273583532ebbcf9b49a1312 Mon Sep 17 00:00:00 2001 From: "riseproject-dev[bot]" <330740410+riseproject-dev[bot]@users.noreply.github.com> Date: Tue, 29 Sep 2026 07:59:49 +0000 Subject: [PATCH 1/2] clvm-rs: Add versions 0.20.0, 0.21.0 Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> --- docs/packages/clvm-rs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/packages/clvm-rs.yaml b/docs/packages/clvm-rs.yaml index 3394533420d..0533db073d5 100644 --- a/docs/packages/clvm-rs.yaml +++ b/docs/packages/clvm-rs.yaml @@ -8,3 +8,5 @@ versions: files: - filename: clvm_rs-0.19.0-cp310-abi3-manylinux_2_34_riscv64.manylinux_2_39_riscv64.whl sha256: beca3a4ae16ba686cf8e41d1b82d58bf67b12b0cab8ba36c7419aee1a8ba7f2e +- version: 0.20.0 +- version: 0.21.0 From 003a302d3f16a720a1369a5c96b08217857de5f2 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Thu, 1 Oct 2026 08:45:56 +0000 Subject: [PATCH 2/2] clvm-rs: carry forward riscv64 patch(es) to 0.20.0, 0.21.0 The nightly-upgrade bot bumped docs/packages/clvm-rs.yaml to add two new versions without creating matching patches/clvm-rs// directories, so the workflow's unconditional 'git apply .../*.patch' step failed with no matching file for both. Carrying forward the same patch(es) from 0.19.0/ unchanged into each; CI will confirm they still apply cleanly. --- ...argo-license-file-so-maturin-ships-L.patch | 46 +++++++++++++++++++ ...argo-license-file-so-maturin-ships-L.patch | 46 +++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 patches/clvm-rs/0.20.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch create mode 100644 patches/clvm-rs/0.21.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch diff --git a/patches/clvm-rs/0.20.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch b/patches/clvm-rs/0.20.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch new file mode 100644 index 00000000000..3cc0fd56432 --- /dev/null +++ b/patches/clvm-rs/0.20.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch @@ -0,0 +1,46 @@ +From 270a4b17ce7d34f9174ecd16e8c9e59eb8a1924a Mon Sep 17 00:00:00 2001 +From: Ludovic Henry +Date: Mon, 28 Sep 2026 00:00:00 +0000 +Subject: [PATCH] wheel: declare Cargo license-file so maturin ships LICENSE in + the wheel + +wheel/pyproject.toml has no [project] table (metadata is fully dynamic +from Cargo.toml), so maturin's PEP 621 license-files auto-discovery +(the LICEN[CS]E* glob beside pyproject.toml) never runs for this +package -- that auto-discovery only fires when a [project] table is +present. With no [project] table, maturin's Metadata24::from_cargo_toml +only populates license_files from Cargo.toml's package.license-file +key; package.license (the SPDX string already set here) is a separate +field that does not feed license_files. Confirmed on the real published +PyPI wheel (clvm_rs-0.19.0-cp310-abi3-manylinux_2_28_x86_64.whl): it +also ships zero dist-info/licenses/ files, so upstream's own packaging +has the same gap. + +Setting license-file (resolved relative to this Cargo.toml, i.e. +wheel/) makes maturin embed the LICENSE our build already copies to +wheel/LICENSE as dist-info/licenses/LICENSE. Verified locally: without +this change the built wheel has no dist-info/licenses/ entry at all; +with it, dist-info/licenses/LICENSE is present. + +Upstream-Status: To upstream [not submitted from this automated port run; needs a pull request against Chia-Network/clvm_rs] + +Signed-off-by: Ludovic Henry +--- + wheel/Cargo.toml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml +index 717d404..f31320f 100644 +--- a/wheel/Cargo.toml ++++ b/wheel/Cargo.toml +@@ -4,6 +4,7 @@ version = "0.19.0" + authors = ["Richard Kiss "] + edition = "2024" + license = "Apache-2.0" ++license-file = "LICENSE" + description = "Implementation of `clvm` for Chia Network's cryptocurrency" + homepage = "https://github.com/Chia-Network/clvm_rs/" + repository = "https://github.com/Chia-Network/clvm_rs/" +-- +2.43.0 + diff --git a/patches/clvm-rs/0.21.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch b/patches/clvm-rs/0.21.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch new file mode 100644 index 00000000000..3cc0fd56432 --- /dev/null +++ b/patches/clvm-rs/0.21.0/0001-wheel-declare-Cargo-license-file-so-maturin-ships-L.patch @@ -0,0 +1,46 @@ +From 270a4b17ce7d34f9174ecd16e8c9e59eb8a1924a Mon Sep 17 00:00:00 2001 +From: Ludovic Henry +Date: Mon, 28 Sep 2026 00:00:00 +0000 +Subject: [PATCH] wheel: declare Cargo license-file so maturin ships LICENSE in + the wheel + +wheel/pyproject.toml has no [project] table (metadata is fully dynamic +from Cargo.toml), so maturin's PEP 621 license-files auto-discovery +(the LICEN[CS]E* glob beside pyproject.toml) never runs for this +package -- that auto-discovery only fires when a [project] table is +present. With no [project] table, maturin's Metadata24::from_cargo_toml +only populates license_files from Cargo.toml's package.license-file +key; package.license (the SPDX string already set here) is a separate +field that does not feed license_files. Confirmed on the real published +PyPI wheel (clvm_rs-0.19.0-cp310-abi3-manylinux_2_28_x86_64.whl): it +also ships zero dist-info/licenses/ files, so upstream's own packaging +has the same gap. + +Setting license-file (resolved relative to this Cargo.toml, i.e. +wheel/) makes maturin embed the LICENSE our build already copies to +wheel/LICENSE as dist-info/licenses/LICENSE. Verified locally: without +this change the built wheel has no dist-info/licenses/ entry at all; +with it, dist-info/licenses/LICENSE is present. + +Upstream-Status: To upstream [not submitted from this automated port run; needs a pull request against Chia-Network/clvm_rs] + +Signed-off-by: Ludovic Henry +--- + wheel/Cargo.toml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml +index 717d404..f31320f 100644 +--- a/wheel/Cargo.toml ++++ b/wheel/Cargo.toml +@@ -4,6 +4,7 @@ version = "0.19.0" + authors = ["Richard Kiss "] + edition = "2024" + license = "Apache-2.0" ++license-file = "LICENSE" + description = "Implementation of `clvm` for Chia Network's cryptocurrency" + homepage = "https://github.com/Chia-Network/clvm_rs/" + repository = "https://github.com/Chia-Network/clvm_rs/" +-- +2.43.0 +