Accepting request 871543 from home:bnavigator:branches:science
- Update to version 7.1.0 * no public changelog - Skip python36 build. Due to NEP 29, astropy, numpy, scipy and co. do not have a python36 flavored package in TW - Refresh lalapps-fix-uninitialised-var.patch - Enable test suite - Fix the python subpackage setup OBS-URL: https://build.opensuse.org/request/show/871543 OBS-URL: https://build.opensuse.org/package/show/science/lalapps?expand=0&rev=7
This commit is contained in:
Git OBS Bridge
parent
bf108e4697
commit
55ba5f2051
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fffa819168e2bb4ad56477281b3ebfc7eeabd950534775b806562a536d134df8
|
||||
size 11077588
|
||||
3
lalapps-7.1.0.tar.xz
Normal file
3
lalapps-7.1.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d27e4a3136c5f85245f0fa9feb0f21e2f6bef0158a3b2ffdd0c1b03941893c27
|
||||
size 29270940
|
||||
@ -1,8 +1,8 @@
|
||||
Index: lalapps-6.26.0/src/string/StringSearch.c
|
||||
Index: lalapps-7.1.0/src/string/StringSearch.c
|
||||
===================================================================
|
||||
--- lalapps-6.26.0.orig/src/string/StringSearch.c
|
||||
+++ lalapps-6.26.0/src/string/StringSearch.c
|
||||
@@ -202,7 +202,7 @@ int main(int argc,char *argv[])
|
||||
--- lalapps-7.1.0.orig/src/string/StringSearch.c
|
||||
+++ lalapps-7.1.0/src/string/StringSearch.c
|
||||
@@ -201,7 +201,7 @@ int main(int argc,char *argv[])
|
||||
unsigned seg_length;
|
||||
StringTemplate strtemplate[MAXTEMPLATES];
|
||||
int NTemplates;
|
||||
@ -11,23 +11,10 @@ Index: lalapps-6.26.0/src/string/StringSearch.c
|
||||
REAL8 fcutoff_fix[MAXTEMPLATES]; /* high frequency cutoffs given by the template bank file */
|
||||
SnglBurst *events=NULL;
|
||||
MetadataTable process;
|
||||
Index: lalapps-6.26.0/src/pulsar/SFTTools/SFTvalidate.c
|
||||
Index: lalapps-7.1.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
===================================================================
|
||||
--- lalapps-6.26.0.orig/src/pulsar/SFTTools/SFTvalidate.c
|
||||
+++ lalapps-6.26.0/src/pulsar/SFTTools/SFTvalidate.c
|
||||
@@ -59,7 +59,7 @@ int main(int argc, char** argv) {
|
||||
/* and read successive SFTs blocks from the file and validate CRC
|
||||
checksums */
|
||||
for (count=0; 1; count++) {
|
||||
- struct headertag2 info,lastinfo;
|
||||
+ struct headertag2 info,lastinfo={};
|
||||
int err=0, swapendian, move, j;
|
||||
|
||||
err=ReadSFTHeader(fp, &info, NULL, &swapendian, 1);
|
||||
Index: lalapps-6.26.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
===================================================================
|
||||
--- lalapps-6.26.0.orig/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
+++ lalapps-6.26.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
--- lalapps-7.1.0.orig/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
+++ lalapps-7.1.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
@@ -1255,7 +1255,7 @@ void SetUpSFTs( LALStatus *status, /**
|
||||
REAL8 timebase, tObs, deltaFsft;
|
||||
UINT4 k,numSFTby2;
|
||||
@ -46,11 +33,11 @@ Index: lalapps-6.26.0/src/pulsar/HoughFstat/HierarchicalSearch.c
|
||||
HoughStats stats; /* statistics struct */
|
||||
CHAR *fileStats = NULL;
|
||||
FILE *fpStats = NULL;
|
||||
Index: lalapps-6.26.0/src/pulsar/SFTTools/splitSFTs.c
|
||||
Index: lalapps-7.1.0/src/pulsar/SFTTools/splitSFTs.c
|
||||
===================================================================
|
||||
--- lalapps-6.26.0.orig/src/pulsar/SFTTools/splitSFTs.c
|
||||
+++ lalapps-6.26.0/src/pulsar/SFTTools/splitSFTs.c
|
||||
@@ -199,7 +199,7 @@ int main( int argc, char **argv )
|
||||
--- lalapps-7.1.0.orig/src/pulsar/SFTTools/splitSFTs.c
|
||||
+++ lalapps-7.1.0/src/pulsar/SFTTools/splitSFTs.c
|
||||
@@ -196,7 +196,7 @@ int main( int argc, char **argv )
|
||||
{
|
||||
int arg; /* current command-line argument */
|
||||
unsigned int bin; /* current bin */
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 12 21:51:42 UTC 2021 - Ben Greiner <code@bnavigator.de>
|
||||
|
||||
- Update to version 7.1.0
|
||||
* no public changelog
|
||||
- Skip python36 build. Due to NEP 29, astropy, numpy, scipy and co.
|
||||
do not have a python36 flavored package in TW
|
||||
- Refresh lalapps-fix-uninitialised-var.patch
|
||||
- Enable test suite
|
||||
- Fix the python subpackage setup
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 2 10:49:34 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
|
||||
88
lalapps.spec
88
lalapps.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package lalapps
|
||||
#
|
||||
# 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
|
||||
@ -17,8 +17,10 @@
|
||||
|
||||
|
||||
%define skip_python2 1
|
||||
# NEP 29: astropy, numpy, scipy do not have a python36 flavor package in TW
|
||||
%define skip_python36 1
|
||||
Name: lalapps
|
||||
Version: 6.26.1
|
||||
Version: 7.1.0
|
||||
Release: 0
|
||||
Summary: LSC Algorithm Library Applications
|
||||
License: GPL-2.0-or-later
|
||||
@ -30,12 +32,12 @@ Patch0: lalapps-fix-uninitialised-var.patch
|
||||
BuildRequires: %{python_module astropy}
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module glue}
|
||||
BuildRequires: %{python_module lal >= 6.21.0}
|
||||
BuildRequires: %{python_module lalburst >= 1.5.4}
|
||||
BuildRequires: %{python_module lal >= 7.1.0}
|
||||
BuildRequires: %{python_module lalburst >= 1.5.3}
|
||||
BuildRequires: %{python_module lalframe >= 1.5.0}
|
||||
BuildRequires: %{python_module lalinference >= 1.11.0}
|
||||
BuildRequires: %{python_module lalmetaio >= 1.6.0}
|
||||
BuildRequires: %{python_module lalpulsar >= 1.18.0}
|
||||
BuildRequires: %{python_module lalinference >= 2.0.0}
|
||||
BuildRequires: %{python_module lalmetaio >= 2.0.0}
|
||||
BuildRequires: %{python_module lalpulsar >= 3.0.0}
|
||||
BuildRequires: %{python_module matplotlib}
|
||||
BuildRequires: %{python_module numpy-devel}
|
||||
BuildRequires: %{python_module numpy}
|
||||
@ -47,28 +49,25 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: python-rpm-macros
|
||||
BuildRequires: swig
|
||||
BuildRequires: pkgconfig(fftw3)
|
||||
BuildRequires: pkgconfig(framel)
|
||||
BuildRequires: pkgconfig(framel) >= 8.39.2
|
||||
BuildRequires: pkgconfig(gsl)
|
||||
BuildRequires: pkgconfig(lal) >= 6.21.0
|
||||
BuildRequires: pkgconfig(lalburst) >= 1.5.4
|
||||
BuildRequires: pkgconfig(lal) >= 7.1.0
|
||||
BuildRequires: pkgconfig(lalburst) >= 1.5.3
|
||||
BuildRequires: pkgconfig(lalframe) >= 1.5.0
|
||||
BuildRequires: pkgconfig(lalinference) >= 1.11.0
|
||||
BuildRequires: pkgconfig(lalinspiral) >= 1.10.0
|
||||
BuildRequires: pkgconfig(lalmetaio) >= 1.6.0
|
||||
BuildRequires: pkgconfig(lalpulsar) >= 1.18.0
|
||||
BuildRequires: pkgconfig(lalsimulation) >= 1.10.0
|
||||
Requires: python3-lal >= 6.21.0
|
||||
Requires: python3-lalburst >= 1.5.4
|
||||
Requires: python3-lalframe >= 1.5.0
|
||||
Requires: python3-lalinference >= 1.11.0
|
||||
Requires: python3-lalinspiral >= 1.10.0
|
||||
Requires: python3-lalmetaio >= 1.6.0
|
||||
Requires: python3-lalpulsar >= 1.18.0
|
||||
Requires: python3-lalsimulation >= 1.10.0
|
||||
Requires: python3-numpy
|
||||
Requires: python3-scipy
|
||||
BuildRequires: pkgconfig(lalinference) >= 2.0.0
|
||||
BuildRequires: pkgconfig(lalinspiral) >= 2.0.0
|
||||
BuildRequires: pkgconfig(lalmetaio) >= 2.0.0
|
||||
BuildRequires: pkgconfig(lalpulsar) >= 3.0.0
|
||||
BuildRequires: pkgconfig(lalsimulation) >= 2.5.0
|
||||
# SECTION For tests
|
||||
BuildRequires: %{python_module pytest}
|
||||
BuildRequires: bc
|
||||
BuildRequires: lalpulsar-data
|
||||
Requires: python3-%{name} = %{version}
|
||||
# /SECTION
|
||||
# 32-bit no longer supported upstream
|
||||
ExcludeArch: %{ix86}
|
||||
%define python_subpackage_only 1
|
||||
%python_subpackages
|
||||
|
||||
%description
|
||||
@ -76,6 +75,31 @@ The LSC Algorithm Library Applications for gravitational wave data analysis.
|
||||
This package contains applications that are built on tools in the LSC
|
||||
Algorithm Library.
|
||||
|
||||
%package -n python-%{name}
|
||||
Summary: LSC Algorithm Library Applications
|
||||
Group: Productivity/Scientific/Physics
|
||||
Requires: python-h5py
|
||||
Requires: python-lal >= 7.10
|
||||
Requires: python-lalburst >= 1.5.3
|
||||
Requires: python-lalframe >= 1.5.0
|
||||
Requires: python-lalinference >= 2.0.0
|
||||
Requires: python-lalinspiral >= 2.0.0
|
||||
Requires: python-lalmetaio >= 2.0.0
|
||||
Requires: python-lalpulsar >= 3.0.0
|
||||
Requires: python-lalsimulation >= 2.5.0
|
||||
Requires: python-ligo-lw
|
||||
Requires: python-ligo-segments
|
||||
Requires: python-matplotlib
|
||||
Requires: python-numpy
|
||||
Requires: python-scipy
|
||||
|
||||
%description -n python-%{name}
|
||||
The LSC Algorithm Library Applications for gravitational wave data analysis.
|
||||
This package contains applications that are built on tools in the LSC
|
||||
Algorithm Library.
|
||||
|
||||
This package contains the python files
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
@ -84,7 +108,7 @@ sed -Ei "1{s|/usr/bin/env python|%{_bindir}/python3|}" \
|
||||
src/pulsar/HeterodyneSearch/make_frame_cache
|
||||
|
||||
%build
|
||||
%{python_expand # Necessary to run %%configure with both py2 and py3
|
||||
%{python_expand # Necessary to run %%configure for all active python flavors
|
||||
export PYTHON=%{_bindir}/$python
|
||||
mkdir ../$python
|
||||
cp -pr ./ ../$python
|
||||
@ -98,7 +122,7 @@ popd
|
||||
}
|
||||
|
||||
%install
|
||||
%{python_expand # py2 and py3 make_install
|
||||
%{python_expand # install for all active python flavors
|
||||
export PYTHON=$python
|
||||
pushd ../$python
|
||||
%make_install
|
||||
@ -144,6 +168,14 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%python_expand %fdupes %{buildroot}%{$python_sitearch}/%{name}/
|
||||
%fdupes %{buildroot}/%{_datadir}/%{name}/
|
||||
|
||||
%check
|
||||
%{python_expand #
|
||||
export PYTHON=$python
|
||||
pushd ../$python
|
||||
%make_build check
|
||||
popd
|
||||
}
|
||||
|
||||
%files -n %{name}
|
||||
%license COPYING
|
||||
%{_bindir}/*
|
||||
@ -151,7 +183,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
||||
%{_mandir}/man1/*
|
||||
%config %{_sysconfdir}/profile.d/%{name}.*
|
||||
|
||||
%files %{python_files}
|
||||
%files %{python_files %{name}}
|
||||
%{python_sitearch}/*
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user