Accepting request 1227914 from science

OBS-URL: https://build.opensuse.org/request/show/1227914
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lalinference?expand=0&rev=14

0001-Replace-SafeConfigParser-with-ConfigParser.patch

@@ -1,45 +0,0 @@
-From 2d0fca820c6258836d3caf0b87fb804ec94e48d4 Mon Sep 17 00:00:00 2001
-From: Ben Greiner <code@bnavigator.de>
-Date: Fri, 1 Mar 2024 18:04:16 +0100
-Subject: [PATCH] Replace SafeConfigParser with ConfigParser
-
-The rename and deprecation happened with Python 3.2 and SafeConfigParser
-was removed in Python 3.12
-
-diff --git a/lalinference/bin/lalinference_pipe.py b/lalinference/bin/lalinference_pipe.py
-index 9dab7c6471..cb35c7dbba 100644
---- alalinference/bin/lalinference_pipe.py
-+++ blalinference/bin/lalinference_pipe.py
-@@ -211,7 +211,7 @@ if len(args)!=1:
- 
- inifile=args[0]
- 
--cp=configparser.SafeConfigParser()
-+cp=configparser.ConfigParser()
- fp=open(inifile)
- cp.optionxform = str
- cp.readfp(fp)
-diff --git a/lalinference/bin/lalinference_review_test.py b/lalinference/bin/lalinference_review_test.py
-index a861dfd631..15dd66892f 100644
---- alalinference/bin/lalinference_review_test.py
-+++ blalinference/bin/lalinference_review_test.py
-@@ -6,7 +6,7 @@ import subprocess
- import glob
- import lalinference
- 
--from six.moves.configparser import SafeConfigParser
-+from configparser import ConfigParser
- 
- prefix=''
- try:
-@@ -101,7 +101,7 @@ except KeyError:
-     sys.exit()
- 
- def init_ini_file(file=args.ini_file):
--    cp=SafeConfigParser()
-+    cp=ConfigParser()
-     fp=open(file)
-     cp.optionxform = str
-     cp.readfp(fp)
-
-

lalinference-4.1.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f16e47171aa680b3a229f8abdf61b758d3a27c5abdec4ed508fdfa7de10553ba
-size 1007936

lalinference-4.1.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9118ea5bae3fcd910cdf8cc3185404d0c0e366e58bedc68104e9e75119da357d
-size 1000636

lalinference-4.1.7.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82578af17e68240c31da390c80985431af73f8cf2dab052089066f661aa976e2
+size 1017360

lalinference-scipy-1_14-compat.patch

@@ -1,30 +0,0 @@
-Index: lalinference-4.1.6/bin/cbcBayesMCMC2pos.py
-===================================================================
---- lalinference-4.1.6.orig/bin/cbcBayesMCMC2pos.py
-+++ lalinference-4.1.6/bin/cbcBayesMCMC2pos.py
-@@ -156,8 +156,8 @@ def downsample_and_evidence(data_hdf5, d
- 	ebetas2 = np.concatenate((betas[::2], [0.0]))
- 	elogls2 = np.concatenate((logls[::2], [logls[::2][-1]]))
- 
--	evidence = -si.trapz(elogls, ebetas)
--	evidence2 = -si.trapz(elogls2, ebetas2)
-+	evidence = -si.trapezoid(elogls, ebetas)
-+	evidence2 = -si.trapezoid(elogls2, ebetas2)
- 
- 	posterior_samples['chain_log_evidence'] = evidence
- 	posterior_samples['chain_delta_log_evidence'] = np.absolute(evidence - evidence2)
-Index: lalinference-4.1.6/bin/cbcBayesThermoInt.py
-===================================================================
---- lalinference-4.1.6.orig/bin/cbcBayesThermoInt.py
-+++ lalinference-4.1.6/bin/cbcBayesThermoInt.py
-@@ -86,8 +86,8 @@ positional arguments:
-     ebetas2 = np.concatenate((betas[::2], [0.0]))
-     elogls2 = np.concatenate((logls[::2], [logls[::2][-1]]))
- 
--    evidence = -si.trapz(elogls, ebetas)
--    evidence2 = -si.trapz(elogls2, ebetas2)
-+    evidence = -si.trapezoid(elogls, ebetas)
-+    evidence2 = -si.trapezoid(elogls2, ebetas2)
- 
-     devidence = np.abs(evidence - evidence2)
- 

lalinference-swig-stringval-not-value.patch

@@ -0,0 +1,33 @@
+From 9dba245ab3692ecf691247a442704f13c075ed34 Mon Sep 17 00:00:00 2001
+From: Karl Wette <karl.wette@ligo.org>
+Date: Thu, 24 Oct 2024 18:06:30 +1100
+Subject: [PATCH] common/swig/generate_swig_iface.py: prefer "stringval" before
+ "value" attribute
+
+- As of SWIG 4.3.0 "value" attribute contains quote characters
+- "stringval" attribute appears to still contain the raw string
+---
+ common/swig/generate_swig_iface.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/common/swig/generate_swig_iface.py b/common/swig/generate_swig_iface.py
+index 530b026d5d..eaee2d41ce 100644
+--- a/common/swig/generate_swig_iface.py
++++ b/common/swig/generate_swig_iface.py
+@@ -195,9 +195,11 @@ class SwigSymbols(object):
+         """Parse a swiglal macro
+         """
+         cdecl_name = get_swig_attr(cdecl, 'name')
+-        cdecl_value = get_swig_attr(cdecl, 'value')
++        cdecl_value = get_swig_attr(cdecl, 'stringval')
+         if not cdecl_value:
+-            raise ValueError("cdecl '{}' has no value".format(cdecl_name))
++            cdecl_value = get_swig_attr(cdecl, 'value')
++            if not cdecl_value:
++                raise ValueError("cdecl '{}' has no value".format(cdecl_name))
+         macro = re.sub(r'\s', '', cdecl_value)
+         if cdecl_name == '__swiglal__':
+             if macro in clear_macros:
+-- 
+GitLab
+

lalinference.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Dec  2 15:18:22 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Add lalinference-swig-stringval-not-value.patch: For
+  compatibility with swig 4.3.0, prefer 'stringval' before 'value'
+  attribute (upstream commit 9dba245a).
+
+-------------------------------------------------------------------
+Thu Sep 12 17:40:21 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Drop upstreamed patches:
+  * 0001-Replace-SafeConfigParser-with-ConfigParser.patch
+  * lalinference-scipy-1_14-compat.patch
+
+-------------------------------------------------------------------
+Wed Sep 11 18:26:12 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 4.1.7 (no release notes).
+
 -------------------------------------------------------------------
 Sat Jul 20 03:44:05 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
 

lalinference.spec

@@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package lalinference
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -32,7 +32,7 @@
 %bcond_with octave
 
 Name:           %{pname}%{?psuffix}
-Version:        4.1.6
+Version:        4.1.7
 Release:        0
 Summary:        LSC Algorithm Inference Library
 License:        GPL-2.0-or-later
@@ -41,10 +41,8 @@ URL:            https://wiki.ligo.org/Computing/DASWG/LALSuite
 Source:         https://software.igwn.org/sources/source/lalsuite/%{pname}-%{version}.tar.xz
 # PATCH-FIX-UPSTREAM lalinference-printf-data-type-consistency.patch badshah400@gmail.com -- Cast data passed to printf from size_t to long to make it consistent with the format "%li"; this fixes build failures on i586
 Patch0:         lalinference-printf-data-type-consistency.patch
-# PATCH-FIX-UPSTREAM 0001-Replace-SafeConfigParser-with-ConfigParser.patch sent to duncan.macleod@ligo.org by code@bnavigator.de
-Patch1:         0001-Replace-SafeConfigParser-with-ConfigParser.patch
-# PATCH-FIX-UPSTREAM lalinference-scipy-1_14-compat.patch badshah400@gmail.com -- Account for name changes of trapezoidal functions in scipy.integrate for scipy >= 1.14
-Patch3:         lalinference-scipy-1_14-compat.patch
+# PATCH-FIX-UPSTREAM
+Patch1:         https://git.ligo.org/lscsoft/lalsuite/-/commit/9dba245ab3692ecf691247a442704f13c075ed34.patch#/lalinference-swig-stringval-not-value.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module numpy-devel >= 1.7}
 BuildRequires:  fdupes
@@ -137,6 +135,7 @@ BuildArch:      noarch
 %description -n %{name}-data
 This package provides the data files for lalinference.
 
+%if %{with octave}
 %package -n octave-lalinference
 Summary:        Octave bindings for LAL Inference
 Group:          Productivity/Scientific/Physics
@@ -152,9 +151,14 @@ Requires:       octave-lalsimulation
 
 %description -n octave-lalinference
 This package provides the necessary files for using LAL Inference with octave.
+%endif
 
 %prep
-%autosetup -p1 -n %{pname}-%{version}
+# Upstream commits are -p1 against the full lalsuite, but -p2 against individual lal* pkgs
+# Patch0 is not upstream and uses -p1, so we have a mix of -p1 and -p2 patches
+%autosetup -N -n %{pname}-%{version}
+%patch -P0 -p1
+%patch -P1 -p2
 
 %build
 %{python_expand # Necessary to run %%configure with all python flavors