Skip to content

Commit 996db42

Browse files
lalsuite: Add version 7.26.16 (#2606)
* lalsuite: Add version 7.26.16 Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> * lalsuite: carry forward riscv64 patches to 7.26.16 Nightly version bump omitted the patches/lalsuite/<version> directory for 7.26.16, so the build's unconditional `git apply .../*.patch` step failed with "No such file or directory" before any build/test ran. Copied forward the same patch set from 7.26.15 (unchanged since then). --------- Signed-off-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> Co-authored-by: riseproject-dev[bot] <330740410+riseproject-dev[bot]@users.noreply.github.com> Co-authored-by: Ludovic Henry <git@ludovic.dev>
1 parent 70e2e74 commit 996db42

2 files changed

Lines changed: 39 additions & 0 deletions

File tree

‎docs/packages/lalsuite.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ versions:
2222
gpl-sources:
2323
filename: gpl-sources.tar
2424
description: gcc, fftw, gsl, metaio, framel
25+
- version: 7.26.16
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From be4d8e2b7a3938a7c6b45bb0b90dfed12b8f756e Mon Sep 17 00:00:00 2001
2+
From: Ludovic Henry <git@ludovic.dev>
3+
Date: Mon, 28 Sep 2026 12:00:00 +0000
4+
Subject: [PATCH] wheel: drop the license_file override so setuptools' default
5+
glob ships every vendored dependency's licence
6+
7+
Upstream-Status: Inappropriate [needed for RISE's own vendored-dependency licence bundling convention; upstream's own wheel_build.yml/wheel.sh never attempts this collection at all, so there is nothing to send upstream]
8+
9+
wheel/setup.cfg sets the deprecated singular `license_file = COPYING`, which
10+
setuptools honours by replacing its default `license_files` discovery
11+
entirely (only that one path is packaged) rather than adding to it. Our
12+
build-lalsuite.yml drops each vendored dependency's licence into the wheel
13+
project root as `LICENSE.<dep>.<file>` for the default `LICEN[CS]E*` glob to
14+
pick up (the same convention build-cvxopt.yml and others use), but with an
15+
explicit override in place none of those files reach `dist-info/licenses/`
16+
and the wheel ends up missing licences for cfitsio, fftw, framel, gsl and
17+
hdf5 alike -- caught by the `assert not missing` check at the end of the
18+
build_wheels job.
19+
20+
Dropping the override, rather than expanding it into an explicit list, lets
21+
setuptools fall back to its default glob patterns (LICEN[CS]E*, COPYING*,
22+
NOTICE*, AUTHORS*), which still matches `COPYING` itself -- so lalsuite's own
23+
licence keeps shipping exactly as before, and every `LICENSE.*` file the
24+
workflow adds is now picked up with no further packaging edit needed.
25+
---
26+
wheel/setup.cfg | 1 -
27+
1 file changed, 1 deletion(-)
28+
29+
diff --git a/wheel/setup.cfg b/wheel/setup.cfg
30+
index 074c015..306d97e 100644
31+
--- a/wheel/setup.cfg
32+
+++ b/wheel/setup.cfg
33+
@@ -1,2 +1 @@
34+
[metadata]
35+
-license_file = COPYING
36+
--
37+
2.43.0
38+

0 commit comments

Comments
 (0)