From a4ea1099de8ed0bb313ba2959be180cb1bd323e2e7a627946a0ff044753b9be5 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sat, 31 Oct 2020 17:03:35 +0000 Subject: [PATCH 1/5] Accepting request 845005 from home:StefanBruens:branches:science - Build without octave bindings on Leap 15.x, requires SWIG 4.0 OBS-URL: https://build.opensuse.org/request/show/845005 OBS-URL: https://build.opensuse.org/package/show/science/lal?expand=0&rev=8 --- lal.changes | 5 +++++ lal.spec | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lal.changes b/lal.changes index 2c88b74..7e01ca3 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 30 09:52:37 UTC 2020 - Stefan Brüns + +- Build without octave bindings on Leap 15.x, requires SWIG 4.0 + ------------------------------------------------------------------- Sun Oct 25 17:56:07 UTC 2020 - Atri Bhattacharya diff --git a/lal.spec b/lal.spec index 84fd1ec..61129c5 100644 --- a/lal.spec +++ b/lal.spec @@ -18,7 +18,11 @@ %define shliblal liblal20 %define shliblalsupport liblalsupport14 +%if 0%{suse_version} >= 1550 %bcond_without octave +%else +%bcond_with octave +%endif Name: lal Version: 7.0.0 Release: 0 @@ -40,7 +44,7 @@ BuildRequires: fdupes BuildRequires: hdf5-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros -BuildRequires: swig >= 4.0 + BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(zlib) @@ -54,6 +58,9 @@ Requires: python-six ExcludeArch: %{ix86} %if %{with octave} BuildRequires: octave-devel +BuildRequires: swig >= 4.0 +%else +BuildRequires: swig >= 3.0 %endif # SECTION For tests (only with python3) BuildRequires: python3-freezegun From 791a995a70c75e4bf2f9aac581fa9630a90a365ba4dbd306e69e75517447982f Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 18 Jan 2021 13:31:41 +0000 Subject: [PATCH 2/5] Accepting request 861890 from home:badshah400:branches:science - Update to version 7.1.0. - Drop lal-implicit-conversion-XLALError.patch: fixed properly upstream. - Add BuildRequires: python3-ligo-lw, needed for new tests. - Disable octave bindings: does not support octave >= 6. OBS-URL: https://build.opensuse.org/request/show/861890 OBS-URL: https://build.opensuse.org/package/show/science/lal?expand=0&rev=10 --- lal-7.0.0.tar.xz | 3 --- lal-7.1.0.tar.xz | 3 +++ lal-implicit-conversion-XLALError.patch | 13 ------------- lal.changes | 10 ++++++++++ lal.spec | 13 +++++-------- 5 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 lal-7.0.0.tar.xz create mode 100644 lal-7.1.0.tar.xz delete mode 100644 lal-implicit-conversion-XLALError.patch diff --git a/lal-7.0.0.tar.xz b/lal-7.0.0.tar.xz deleted file mode 100644 index 0761ba4..0000000 --- a/lal-7.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83a92377285ca0a2e6e48ae5ef8ad96a15dde62dc919f85ae93512dc942f860f -size 1713536 diff --git a/lal-7.1.0.tar.xz b/lal-7.1.0.tar.xz new file mode 100644 index 0000000..74d9ee4 --- /dev/null +++ b/lal-7.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81f1df34b178893483c7ed4262d1ffe98be6110c94f94a4ba8a405f62dd349e9 +size 2321872 diff --git a/lal-implicit-conversion-XLALError.patch b/lal-implicit-conversion-XLALError.patch deleted file mode 100644 index 755e667..0000000 --- a/lal-implicit-conversion-XLALError.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lal-6.22.0/lib/std/XLALError.h -=================================================================== ---- lal-6.22.0.orig/lib/std/XLALError.h -+++ lal-6.22.0/lib/std/XLALError.h -@@ -698,7 +698,7 @@ void XLALError(const char *func, - *
  • \b ... (Optional) Additional arguments for printf-like format. - * - */ --#define XLAL_ERROR(...) _XLAL_ERROR_IMPL_(return XLAL_FAILURE, __VA_ARGS__) -+#define XLAL_ERROR(...) _XLAL_ERROR_IMPL_(return (LALTYPECODE)XLAL_FAILURE, __VA_ARGS__) - - /** - * Macro to invoke a failure from a XLAL routine returning a pointer. diff --git a/lal.changes b/lal.changes index 7e01ca3..35176c9 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 21 22:11:03 UTC 2020 - Atri Bhattacharya + +- Update to version 7.1.0: + * No release notes. +- Drop lal-implicit-conversion-XLALError.patch: fixed properly + upstream. +- Add BuildRequires: python3-ligo-lw, needed for new tests. +- Disable octave bindings: does not support octave >= 6. + ------------------------------------------------------------------- Fri Oct 30 09:52:37 UTC 2020 - Stefan Brüns diff --git a/lal.spec b/lal.spec index 61129c5..2597558 100644 --- a/lal.spec +++ b/lal.spec @@ -18,21 +18,17 @@ %define shliblal liblal20 %define shliblalsupport liblalsupport14 -%if 0%{suse_version} >= 1550 -%bcond_without octave -%else -%bcond_with octave -%endif + +# No support for octave >= 6 +%bcond_with octave Name: lal -Version: 7.0.0 +Version: 7.1.0 Release: 0 Summary: A collection of various gravitational wave data analysis routines License: GPL-2.0-only Group: Productivity/Scientific/Physics URL: https://wiki.ligo.org/Computing/LALSuite Source: http://software.ligo.org/lscsoft/source/lalsuite/lal-%{version}.tar.xz -# PATCH-FIX-UPSTREAM lal-implicit-conversion-XLALError.patch badshah400@gmail.com -- Fix an implicit coversion issue flagged by GCC 10 -Patch0: lal-implicit-conversion-XLALError.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module lscsoft-glue} BuildRequires: %{python_module numpy-devel} @@ -64,6 +60,7 @@ BuildRequires: swig >= 3.0 %endif # SECTION For tests (only with python3) BuildRequires: python3-freezegun +BuildRequires: python3-ligo-lw BuildRequires: python3-ligo-segments BuildRequires: python3-pytest BuildRequires: python3-python-dateutil From b34d9285e7869db915fb18890c807b47654007c0cdf522fcd72c72bc94cb35af Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Mon, 18 Jan 2021 14:23:03 +0000 Subject: [PATCH 3/5] Accepting request 864090 from home:badshah400:branches:science Drop lscsoft-glue BuildRequires: no longer required and prevents circular dependency with lscsoft-glue which indeed needs lal for its tests. OBS-URL: https://build.opensuse.org/request/show/864090 OBS-URL: https://build.opensuse.org/package/show/science/lal?expand=0&rev=11 --- lal.changes | 7 +++++++ lal.spec | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lal.changes b/lal.changes index 35176c9..52be34d 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 18 13:49:55 UTC 2021 - Atri Bhattacharya + +- Drop lscsoft-glue BuildRequires: no longer required and prevents + circular dependency with lscsoft-glue which indeed needs lal for + its tests. + ------------------------------------------------------------------- Mon Dec 21 22:11:03 UTC 2020 - Atri Bhattacharya diff --git a/lal.spec b/lal.spec index 2597558..f367c12 100644 --- a/lal.spec +++ b/lal.spec @@ -1,7 +1,7 @@ # # spec file for package lal # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,6 @@ Group: Productivity/Scientific/Physics URL: https://wiki.ligo.org/Computing/LALSuite Source: http://software.ligo.org/lscsoft/source/lalsuite/lal-%{version}.tar.xz BuildRequires: %{python_module devel} -BuildRequires: %{python_module lscsoft-glue} BuildRequires: %{python_module numpy-devel} BuildRequires: %{python_module numpy} BuildRequires: %{python_module six} From 95bf04ab34bec6bc4073126f3f4727778c1a355b0fa8fad6a53a34145ca8eeb8 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sat, 6 Feb 2021 21:59:47 +0000 Subject: [PATCH 4/5] Accepting request 865526 from home:badshah400:branches:science - Recommend rather than require python-ligo-lw and python-ligo-segments to avoid circular dependencies (these pkgs also require lal). - Fix the test suite setup to actually call the tests OBS-URL: https://build.opensuse.org/request/show/865526 OBS-URL: https://build.opensuse.org/package/show/science/lal?expand=0&rev=12 --- lal.changes | 12 ++++++++++++ lal.spec | 24 +++++++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/lal.changes b/lal.changes index 52be34d..aa4a4a4 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jan 21 22:58:57 UTC 2021 - Atri Bhattacharya + +- Recommend rather than require python-ligo-lw and + python-ligo-segments to avoid circular dependencies (these pkgs + also require lal). + +------------------------------------------------------------------- +Mon Jan 18 21:09:11 UTC 2021 - Benjamin Greiner + +- Fix the test suite setup to actually call the tests + ------------------------------------------------------------------- Mon Jan 18 13:49:55 UTC 2021 - Atri Bhattacharya diff --git a/lal.spec b/lal.spec index f367c12..96735b3 100644 --- a/lal.spec +++ b/lal.spec @@ -39,17 +39,16 @@ BuildRequires: fdupes BuildRequires: hdf5-devel BuildRequires: pkgconfig BuildRequires: python-rpm-macros - BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(zlib) Requires: python-freezegun -Requires: python-ligo-segments -Requires: python-lscsoft-glue Requires: python-numpy Requires: python-python-dateutil Requires: python-scipy Requires: python-six +Recommends: python-ligo-lw +Recommends: python-ligo-segments ExcludeArch: %{ix86} %if %{with octave} BuildRequires: octave-devel @@ -57,7 +56,7 @@ BuildRequires: swig >= 4.0 %else BuildRequires: swig >= 3.0 %endif -# SECTION For tests (only with python3) +# SECTION For tests (only the default python3 flavor) BuildRequires: python3-freezegun BuildRequires: python3-ligo-lw BuildRequires: python3-ligo-segments @@ -127,7 +126,7 @@ This package provides the octave module for lal. %autosetup -p1 %build -%{python_expand # Necessary to run %%configure with both py2 and py3 +%{python_expand # Necessary to run %%configure with all python flavors export PYTHON=$python mkdir ../${PYTHON}_build cp -pr ./ ../${PYTHON}_build @@ -140,7 +139,7 @@ popd } %install -%{python_expand # py2 and py3 make_install +%{python_expand # all python flavors as configured above export PYTHON=$python pushd ../${PYTHON}_build %make_install @@ -159,14 +158,17 @@ sed -Ei "1{/^#!\/usr\/bin\/env python/d}" %{buildroot}%{$python_sitearch}/lal/gp sed -Ei "1{/^#!\/usr\/bin\/env python/d}" %{buildroot}%{$python_sitearch}/lal/series.py sed -Ei "1{/^#!\/usr\/bin\/env python/d}" %{buildroot}%{$python_sitearch}/lal/antenna.py } +%{?python_compileall} -%ifpython3 %check -# Run tests from the python3 build dir -pushd ../python3_build +%{python_expand # Run tests from the build dir of the primary python3 flavor only +if [ "$python_" = "python3_" -o "%{$python_provides}" = "python3" ]; then +export PYTHON=$python +pushd ../${PYTHON}_build %make_build check popd -%endif +fi +} %post -n %{shliblal} -p /sbin/ldconfig %post -n %{shliblalsupport} -p /sbin/ldconfig @@ -174,7 +176,7 @@ popd %postun -n %{shliblalsupport} -p /sbin/ldconfig %files %{python_files} -%{python_sitearch}/* +%{python_sitearch}/lal %files -n %{shliblal} %{_libdir}/liblal.so.* From 6af55f57e719189072265d45acfa01956cb8040fd578d08b86ab1e35f4f1ff44 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sat, 13 Feb 2021 11:35:51 +0000 Subject: [PATCH 5/5] Accepting request 871539 from home:bnavigator:branches:science - Update to 7.1.1 * no release notes - Skip python36 build. Due to NEP 29, python36-numpy and scipy in TW are no more. OBS-URL: https://build.opensuse.org/request/show/871539 OBS-URL: https://build.opensuse.org/package/show/science/lal?expand=0&rev=13 --- lal-7.1.0.tar.xz | 3 --- lal-7.1.1.tar.xz | 3 +++ lal.changes | 8 ++++++++ lal.spec | 5 ++++- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 lal-7.1.0.tar.xz create mode 100644 lal-7.1.1.tar.xz diff --git a/lal-7.1.0.tar.xz b/lal-7.1.0.tar.xz deleted file mode 100644 index 74d9ee4..0000000 --- a/lal-7.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81f1df34b178893483c7ed4262d1ffe98be6110c94f94a4ba8a405f62dd349e9 -size 2321872 diff --git a/lal-7.1.1.tar.xz b/lal-7.1.1.tar.xz new file mode 100644 index 0000000..364f7ea --- /dev/null +++ b/lal-7.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97905d5da27c62c7e153db49825e23cafd53fd295659313829dd6110d820b316 +size 2326424 diff --git a/lal.changes b/lal.changes index aa4a4a4..5c54270 100644 --- a/lal.changes +++ b/lal.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 12 20:32:18 UTC 2021 - Ben Greiner + +- Update to 7.1.1 + * no release notes +- Skip python36 build. Due to NEP 29, python36-numpy and scipy in + TW are no more. + ------------------------------------------------------------------- Thu Jan 21 22:58:57 UTC 2021 - Atri Bhattacharya diff --git a/lal.spec b/lal.spec index 96735b3..400a607 100644 --- a/lal.spec +++ b/lal.spec @@ -16,13 +16,16 @@ # +# NEP 29: numpy, scipy do not have a python36 flavor package in TW +%define skip_python36 1 + %define shliblal liblal20 %define shliblalsupport liblalsupport14 # No support for octave >= 6 %bcond_with octave Name: lal -Version: 7.1.0 +Version: 7.1.1 Release: 0 Summary: A collection of various gravitational wave data analysis routines License: GPL-2.0-only