Commit 74303a79 authored by Adam Mercer's avatar Adam Mercer

Merge branch 'merge-release-branch'

parents fd09cc1a 9caa8c58
Pipeline #92841 canceled with stages
in 75 minutes and 57 seconds
......@@ -37,3 +37,4 @@ meta.yaml
tags
TAGS
.pytest_cache
test_python_imports.py
FROM igwn/base:el7
FROM igwn/base:el7-testing
LABEL name="LALSuite Nightly - EL7" \
maintainer="Adam Mercer <adam.mercer@ligo.org>" \
......
......@@ -22,16 +22,18 @@ stages:
- deploy
variables:
DOCKER_DRIVER: overlay
GIT_DEPTH: 1
APT_GET: "apt-get -y -q -q -o dir::cache::archives=${CI_PROJECT_DIR}/.cache/apt"
BRANCH: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
COMMIT: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
NIGHTLY: $CI_REGISTRY_IMAGE:nightly
TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
LAL_DIR: $CI_PROJECT_DIR/opt/lalsuite
CONDA_BLD_PATH: "${CI_PROJECT_DIR}/conda/bld"
CONDA_PKGS_DIRS: "${CI_PROJECT_DIR}/conda/pkgs"
DOCKER_DRIVER: overlay
GIT_DEPTH: 1
LAL_DIR: $CI_PROJECT_DIR/opt/lalsuite
NIGHTLY: $CI_REGISTRY_IMAGE:nightly
TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
YUM: "yum -y -q --setopt=cachedir=${CI_PROJECT_DIR}/.cache/yum --setopt=keepcache=1"
YUM_OPTS: "-y -q --setopt=cachedir=${CI_PROJECT_DIR}/.cache/yum --setopt=keepcache=1"
before_script:
- set -x # print commands as they are run (helps debugging)
......@@ -77,11 +79,18 @@ cache:
# -- rpm
.yum-cache: &yum-cache
cache:
key: "${CI_JOB_NAME}"
paths:
- .cache/yum
.yum-update: &yum-update
yum-config-manager --disable htcondor 1>/dev/null && yum -y update
yum-config-manager --disable htcondor 1>/dev/null && ${YUM} update
.rpmbuild: &rpmbuild
image: igwn/lalsuite-dev:el7
<<: *yum-cache
image: igwn/base:el7-testing
variables:
GIT_STRATEGY: none
RPM_BUILD_CPUS: 4
......@@ -89,9 +98,9 @@ cache:
- PACKAGE=${CI_JOB_NAME%%:*}
# install srpm dependencies
- *yum-update
- yum -y install yum-utils epel-rpm-macros
- ${YUM} install lscsoft-packaging-tools
# install upstream packages
- if [ -d rpmbuild ]; then yum -y install rpmbuild/RPMS/x86_64/*.rpm; fi
- if [ -d rpmbuild ]; then ${YUM} install rpmbuild/RPMS/x86_64/*.rpm; fi
# build src.rpm
- cd ${PACKAGE}/
- TARBALL=$(ls -t1 ${PACKAGE}-*.tar.* | head -n1 | xargs readlink -f)
......@@ -100,7 +109,7 @@ cache:
# lint src.rpm
- rpmlint ${SRCRPM}
# install build dependencies
- yum-builddep -y -q ${SRCRPM}
- yum-builddep ${YUM_OPTS} ${SRCRPM}
# build binary rpms and print details of what we got
- rpmbuild --rebuild --define "_topdir $CI_PROJECT_DIR/rpmbuild" ${SRCRPM}
- rpm -qilp ${CI_PROJECT_DIR}/rpmbuild/RPMS/*/*${PACKAGE}-*.rpm
......@@ -119,14 +128,31 @@ cache:
# -- debian
.apt-cache: &apt-cache
cache:
key: "${CI_JOB_NAME}"
paths:
- .cache/apt
.apt-update: &apt-update
mkdir -p "${CI_PROJECT_DIR}/.cache/apt/partial" &&
${APT_GET} autoclean &&
${APT_GET} update
.debuild: &debbuild
image: igwn/lalsuite-dev:stretch
<<: *apt-cache
image: igwn/base:stretch
variables:
GIT_STRATEGY: none
script:
- PACKAGE=${CI_JOB_NAME%%:*}
# install debs from artifacts
- dpkg -i *.deb || true
- *apt-update
- ${APT_GET} install
devscripts
dpkg-dev
lintian
- "ls *.deb &>/dev/null && { dpkg -i *.deb || { ${APT_GET} -f install; dpkg -i *.deb; } }"
# create orig tarball
- cd ${PACKAGE}/
- TARBALL=$(ls -t1 ${PACKAGE}-*.tar.* | head -n1 | xargs readlink -f)
......@@ -141,8 +167,8 @@ cache:
- cd ${PACKAGE}-*/
- dch -v ${VERSION}-1 -b 'Rebuilt automatically on git.ligo.org CI'
# install build dependencies
- apt-get -y -q install devscripts
- mk-build-deps --tool "apt-get -y" --install --remove
- ${APT_GET} -q install devscripts
- mk-build-deps --tool "${APT_GET}" --install --remove
# build packages
- debuild -us -uc -r
artifacts:
......@@ -569,11 +595,15 @@ lalapps:conda:
# -- integration tests --------------------------
lalinference_testjob:
<<: *yum-cache
stage: integration tests
image: igwn/lalsuite-dev:el7
image: igwn/base:el7-testing
before_script:
- *yum-update
- yum -y install rpmbuild/RPMS/x86_64/*.rpm
- ${YUM} install
git
git-lfs
- ${YUM} install rpmbuild/RPMS/x86_64/*.rpm
script:
- git lfs clone https://git.ligo.org/lscsoft/ROQ_data --include "**/params.dat,*/4s/**"
- bash lalinference/test/lalinference_nestedSampling_integration_test.sh
......@@ -596,24 +626,15 @@ lalinference_testjob:
when: always
top-level:
stage: integration tests
image: igwn/lalsuite-dev:el7
needs:
- make-dist
<<: *top-level-build
only:
- pushes
top-level-testing:
stage: integration tests
image: igwn/lalsuite-dev:el7-testing
needs:
- make-dist
<<: *top-level-build
only:
- pushes
- schedules
- web
allow_failure: true
# -- docker -------------------------------------
......
AC_PREREQ([2.63])
AC_INIT([LALSuite],[6.62.1],[lal-discuss@ligo.org])
AC_INIT([LALSuite],[6.63.1],[lal-discuss@ligo.org])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_AUX_DIR([gnuscripts])
AC_CONFIG_MACRO_DIR([gnuscripts])
......
# Common lalsuite python testing rules
#
# This file adds the test_python_scripts.py and test_python_imports.py
# scripts to the test suites, and adds the necessary clean rules to
# tidy up
EXTRA_DIST =
include $(top_srcdir)/gnuscripts/lalsuite_test.am
test_scripts += \
test_python_imports.py \
test_python_scripts.py \
$(END_OF_LIST)
EXTRA_DIST += \
exclude-modules.txt \
exclude-scripts.txt \
$(END_OF_LIST)
clean-local:
-rm -rf __pycache__ .pytest_cache
AC_PREREQ([2.63])
AC_INIT([LAL],[6.20.2.1],[lal-discuss@ligo.org])
AC_INIT([LAL],[6.21.0.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([lib/config.h lib/LALConfig.h])
AC_CONFIG_SRCDIR([lib/std/LALStdio.h])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -45,6 +45,7 @@ AC_CONFIG_FILES([ \
test/inject/Makefile \
test/noisemodels/Makefile \
test/python/Makefile \
test/python/test_python_imports.py \
test/stats/Makefile \
test/std/Makefile \
test/support/Makefile \
......@@ -88,8 +89,8 @@ LALSUITE_DISTCHECK_CONFIGURE_FLAGS
# then increment age.
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT],[17])
AC_SUBST([LIBREVISION],[1])
AC_SUBST([LIBCURRENT],[18])
AC_SUBST([LIBREVISION],[0])
AC_SUBST([LIBAGE],[0])
AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
......@@ -107,9 +108,9 @@ AC_SUBST([LIBVERSION],[${LIBCURRENT}:${LIBREVISION}:${LIBAGE}])
# then increment age.
# 6. if any interfaces have been removed since the last public release,
# then set age to 0.
AC_SUBST([LIBCURRENT_SUPPORT],[13])
AC_SUBST([LIBCURRENT_SUPPORT],[14])
AC_SUBST([LIBREVISION_SUPPORT],[0])
AC_SUBST([LIBAGE_SUPPORT],[1])
AC_SUBST([LIBAGE_SUPPORT],[0])
AC_SUBST([LIBVERSION_SUPPORT],[${LIBCURRENT_SUPPORT}:${LIBREVISION_SUPPORT}:${LIBAGE_SUPPORT}])
LAL_ENABLE_INTELFFT
......
lal (6.20.1-1) unstable; urgency=low
* O3b release
-- Adam Mercer <adam.mercer@ligo.org> Fri, 22 Nov 2019 15:56:31 -0700
lal (6.20.2-1) unstable; urgency=low
* MKL FFT fixes
......
......@@ -6,11 +6,14 @@ Uploaders: Adam Mercer <adam.mercer@ligo.org>, GitLab <gitlab@git.ligo.org>
Build-Depends: bc,
debhelper (>= 9),
dh-python,
gcc,
g++,
less,
libfftw3-dev,
libgsl0-dev (>= 1.9) | libgsl-dev,
libhdf5-dev,
liboctave-dev,
make,
pkg-config (>= 0.18.0),
python-all-dev,
python-dateutil,
......@@ -19,6 +22,7 @@ Build-Depends: bc,
python-ligo-segments,
python-mock,
python-numpy,
python-pathlib,
python-pytest,
python-scipy,
python-six,
......
../../gnuscripts/lalsuite_test_python.am
\ No newline at end of file
%define nightly @NIGHTLY_VERSION@%{nil}
%define _sysconfdir %{_prefix}/etc
%define release 1
%define release 3
%define configure_opts GSL_LIBS="-lgsl"
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
......@@ -23,12 +23,15 @@ Prefix: %{_prefix}
# -- build requirements -----
# C
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: bc
BuildRequires: fftw-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: gsl-devel
BuildRequires: hdf5-devel
BuildRequires: less
BuildRequires: make
BuildRequires: pkgconfig >= 0.18.0
# swig
BuildRequires: swig >= 3.0.7
......@@ -37,15 +40,16 @@ BuildRequires: swig >= 3.0.7
BuildRequires: python2-rpm-macros
BuildRequires: python
BuildRequires: python-devel
BuildRequires: glue >= @MIN_GLUE_VERSION@
BuildRequires: numpy
BuildRequires: python-dateutil
BuildRequires: python-pytest
BuildRequires: python-six
BuildRequires: python2-dateutil
BuildRequires: python2-freezegun
BuildRequires: python2-glue >= @MIN_GLUE_VERSION@
BuildRequires: python2-ligo-segments
BuildRequires: python2-mock
BuildRequires: scipy
BuildRequires: python2-numpy
BuildRequires: python-pathlib
BuildRequires: pytest
BuildRequires: python2-six
BuildRequires: python2-scipy
# python3x
BuildRequires: python-srpm-macros
......@@ -98,12 +102,12 @@ Summary: Python %{python2_version} bindings for LAL
Group: LAL
Requires: %{name} = %{version}
Requires: python
Requires: python-dateutil
Requires: numpy
Requires: scipy
Requires: python-six
Requires: python2-dateutil
Requires: python2-glue >= @MIN_GLUE_VERSION@
Requires: python2-ligo-segments
Requires: glue >= @MIN_GLUE_VERSION@
Requires: python2-numpy
Requires: python2-scipy
Requires: python2-six
Provides: %{name}-python = %{version}-%{release}
Obsoletes: %{name}-python < %{version}-%{release}
%{?python_provide:%python_provide python2-%{name}}
......@@ -152,9 +156,10 @@ This package provides the Octave bindings.
rm -rf %py3dir
cp -r . %py3dir
pushd %py3dir
%configure %{configure_opts} --disable-gcc-flags --disable-swig-octave --enable-swig-python PYTHON=%{__python3}
rm -rfv python/%{name}/*.{la,lo,o} python/%{name}/.libs
%configure %{configure_opts} --disable-doxygen --disable-gcc-flags --disable-swig-octave --enable-swig-python PYTHON=%{__python3}
%{__make} %{?_smp_mflags} V=1 -C swig
%{__make} %{?_smp_mflags} V=1 -C python
%{__make} %{?_smp_mflags} V=1 -C python/%{name}
popd
%check
......@@ -168,7 +173,7 @@ popd
%make_install
# python3
%{__make} -C %py3dir -C swig install-exec-am DESTDIR=%{?buildroot}
%{__make} -C %py3dir -C python install DESTDIR=%{?buildroot}
%{__make} -C %py3dir -C python/%{name} install DESTDIR=%{?buildroot}
find $RPM_BUILD_ROOT%{_libdir} -name '*.la' -delete
%post
......@@ -218,6 +223,15 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Dec 09 2019 Adam Mercer <adam.mercer@ligo.org> 6.21.0-3
- Packaging updates
* Wed Dec 04 2019 Adam Mercer <adam.mercer@ligo.org> 6.21.0-2
- Packaging updates
* Fri Nov 22 2019 Adam Mercer <adam.mercer@ligo.org> 6.21.0-1
- O3b release
* Wed Jun 26 2019 Adam Mercer <adam.mercer@ligo.org> 6.20.2-1
- MKL FFT fixes
......
EXTRA_DIST = \
874000000-20000.cache
include $(top_srcdir)/gnuscripts/lalsuite_test_python.am
include $(top_srcdir)/gnuscripts/lalsuite_test.am
EXTRA_DIST += \
874000000-20000.cache \
$(END_OF_LIST)
# Add compiled test programs to this variable
test_programs +=
# Add shell, Python, etc. test scripts to this variable
test_scripts += \
test_python_scripts.py \
test_python_imports.py \
test_antenna.py \
test_cache.py \
test_gpstime.py \
test_rate.py \
utils_cache_verify.py
test_antenna.py \
test_cache.py \
test_gpstime.py \
test_rate.py \
utils_cache_verify.py \
$(END_OF_LIST)
# Add any helper programs required by tests to this variable
test_helpers +=
# Add paths, relative to the `python/` directory to this file
# to ignore them from the `test_python_imports.py` test script,
# see /test/README.md in the upstream repo for more details
# Add script names (excluding the `.py` extension) to this file
# to ignore them from the `test_python_scripts.py` test script,
# see /test/README.md in the upstream repo for more details
../../../test/test_python_imports.py
\ No newline at end of file
../../../test/test_python_imports.py.in
\ No newline at end of file
......@@ -9,14 +9,14 @@
{% set url = "file://@TARBALL@" %}
{% set sha256 = "@SHA256@" %}
{% set lal_version = "6.20.0" %}
{% set lalburst_version = "1.5.1" %}
{% set lalframe_version = "1.4.0" %}
{% set lalinference_version = "1.11.0" %}
{% set lalinspiral_version = "1.9.0" %}
{% set lalmetaio_version = "1.5.0" %}
{% set lalpulsar_version = "1.18.0" %}
{% set lalsimulation_version = "1.9.0" %}
{% set lal_version = "6.21.0" %}
{% set lalburst_version = "1.5.3" %}
{% set lalframe_version = "1.5.0" %}
{% set lalinference_version = "1.11.4" %}
{% set lalinspiral_version = "1.10.0" %}
{% set lalmetaio_version = "1.6.0" %}
{% set lalpulsar_version = "1.18.2" %}
{% set lalsimulation_version = "1.10.0" %}
package:
name: {{ name }}
......@@ -50,41 +50,41 @@ requirements:
- cfitsio
- fftw * nompi*
- gsl
- lal >={{ lal_version }}
- lalburst >={{ lalburst_version }}
- lalframe >={{ lalframe_version }}
- lalinference >={{ lalinference_version }}
- lalinspiral >={{ lalinspiral_version }}
- lalmetaio >={{ lalmetaio_version }}
- lalpulsar >={{ lalpulsar_version }}
- lalsimulation >={{ lalsimulation_version }}
- lal >={{ lal_version }}a0
- lalburst >={{ lalburst_version }}a0
- lalframe >={{ lalframe_version }}a0
- lalinference >={{ lalinference_version }}a0
- lalinspiral >={{ lalinspiral_version }}a0
- lalmetaio >={{ lalmetaio_version }}a0
- lalpulsar >={{ lalpulsar_version }}a0
- lalsimulation >={{ lalsimulation_version }}a0
- libframe
- llvm-openmp # [osx]
- metaio
- openmp # [linux]
- python
- python-lal >={{ lal_version }}
- python-lalburst >={{ lalburst_version }}
- python-lalinference >={{ lalinference_version }}
- python-lalinspiral >={{ lalinspiral_version }}
- python-lalframe >={{ lalframe_version }}
- python-lalmetaio >={{ lalmetaio_version }}
- python-lalpulsar >={{ lalpulsar_version }}
- python-lalsimulation >={{ lalsimulation_version }}
- python-lal >={{ lal_version }}a0
- python-lalburst >={{ lalburst_version }}a0
- python-lalinference >={{ lalinference_version }}a0
- python-lalinspiral >={{ lalinspiral_version }}a0
- python-lalframe >={{ lalframe_version }}a0
- python-lalmetaio >={{ lalmetaio_version }}a0
- python-lalpulsar >={{ lalpulsar_version }}a0
- python-lalsimulation >={{ lalsimulation_version }}a0
run:
- cfitsio
- fftw
- gsl
- h5py
- healpy
- lal >={{ lal_version }}
- lalframe >={{ lalframe_version }}
- lalmetaio >={{ lalmetaio_version }}
- lalsimulation >={{ lalsimulation_version }}
- lalburst >={{ lalburst_version }}
- lalinspiral >={{ lalinspiral_version }}
- lalpulsar >={{ lalpulsar_version }}
- lalinference >={{ lalinference_version }}
- lal >={{ lal_version }}a0
- lalframe >={{ lalframe_version }}a0
- lalmetaio >={{ lalmetaio_version }}a0
- lalsimulation >={{ lalsimulation_version }}a0
- lalburst >={{ lalburst_version }}a0
- lalinspiral >={{ lalinspiral_version }}a0
- lalpulsar >={{ lalpulsar_version }}a0
- lalinference >={{ lalinference_version }}a0
- libframe
- ligo-segments
- llvm-openmp # [osx]
......@@ -93,14 +93,14 @@ requirements:
- numpy
- pillow
- python
- python-lal >={{ lal_version }}
- python-lalburst >={{ lalburst_version }}
- python-lalframe >={{ lalframe_version }}
- python-lalinference >={{ lalinference_version }}
- python-lalinspiral >={{ lalinspiral_version }}
- python-lalmetaio >={{ lalmetaio_version }}
- python-lalpulsar >={{ lalpulsar_version }}
- python-lalsimulation >={{ lalsimulation_version }}
- python-lal >={{ lal_version }}a0
- python-lalburst >={{ lalburst_version }}a0
- python-lalframe >={{ lalframe_version }}a0
- python-lalinference >={{ lalinference_version }}a0
- python-lalinspiral >={{ lalinspiral_version }}a0
- python-lalmetaio >={{ lalmetaio_version }}a0
- python-lalpulsar >={{ lalpulsar_version }}a0
- python-lalsimulation >={{ lalsimulation_version }}a0
- python-ligo-lw <1.6.0a0
test:
......
AC_PREREQ([2.63])
AC_INIT([LALApps],[6.24.0.1],[lal-discuss@ligo.org])
AC_INIT([LALApps],[6.25.0.1],[lal-discuss@ligo.org])
AC_CONFIG_HEADERS([src/config.h])
AC_CONFIG_SRCDIR([src/lalapps/lalapps.c])
AC_CONFIG_AUX_DIR([gnuscripts])
......@@ -56,14 +56,14 @@ AM_INIT_AUTOMAKE([ \
])
# version requirements
MIN_LAL_VERSION="6.20.0"
MIN_LALFRAME_VERSION="1.4.0"
MIN_LALMETAIO_VERSION="1.5.0"
MIN_LALSIMULATION_VERSION="1.9.0"
MIN_LALBURST_VERSION="1.5.1"
MIN_LALINSPIRAL_VERSION="1.9.0"
MIN_LALPULSAR_VERSION="1.18.0"
MIN_LALINFERENCE_VERSION="1.11.0"
MIN_LAL_VERSION="6.21.0"
MIN_LALFRAME_VERSION="1.5.0"
MIN_LALMETAIO_VERSION="1.6.0"
MIN_LALSIMULATION_VERSION="1.10.0"
MIN_LALBURST_VERSION="1.5.3"
MIN_LALINSPIRAL_VERSION="1.10.0"
MIN_LALPULSAR_VERSION="1.18.2"
MIN_LALINFERENCE_VERSION="1.11.4"
AC_SUBST([MIN_LAL_VERSION])
AC_SUBST([MIN_LALFRAME_VERSION])
AC_SUBST([MIN_LALMETAIO_VERSION])
......
lalapps (6.25.0-1) unstable; urgency=low
* O3b release
-- Adam Mercer <adam.mercer@ligo.org> Wed, 27 Nov 2019 16:54:54 -0700
lalapps (6.24.0-1) unstable; urgency=low
* O3 release
......
......@@ -6,6 +6,7 @@ Uploaders: Adam Mercer <adam.mercer@ligo.org>, GitLab <gitlab@git.ligo.org>
Build-Depends: bc,
debhelper (>= 9),
dh-python,
gcc,
help2man,
less,
libcfitsio3-dev | libcfitsio-dev,
......@@ -13,6 +14,7 @@ Build-Depends: bc,
libframe-dev (>= 8.0),
libgsl-dev | libgsl0-dev (>= 1.9),
libmetaio-dev (>= 8.2),
make,
pkg-config (>= 0.18.0),
python-all-dev,
python-six,
......
%define nightly @NIGHTLY_VERSION@%{nil}
%define _prefix /usr
%define _mandir %{_prefix}/share/man
%define release 2
%define _sysconfdir %{_prefix}/etc
%define _pkgpythondir %{_prefix}/lib64/python2.?/site-packages/@PACKAGE@
%define _pkgpyexecdir %{_libdir}/python2.?/site-packages/@PACKAGE@
%define release 1
%if "%{?nightly:%{nightly}}%{!?nightly:0}" == "%{nil}"
%undefine nightly
......@@ -19,59 +15,65 @@ Group: LAL
Source: %{name}-%{version}%{?nightly:-%{nightly}}.tar.xz
URL: https://wiki.ligo.org/Computing/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: bc
BuildRequires: cfitsio-devel
BuildRequires: fftw-devel
BuildRequires: gcc
BuildRequires: gsl-devel
BuildRequires: help2man
BuildRequires: less
BuildRequires: libframe-devel
BuildRequires: libmetaio-devel
BuildRequires: lal-devel >= @MIN_LAL_VERSION@
BuildRequires: python2-lal >= @MIN_LAL_VERSION@
BuildRequires: lalburst-devel >= @MIN_LALBURST_VERSION@
BuildRequires: lalframe-devel >= @MIN_LALFRAME_VERSION@
BuildRequires: python2-lalframe >= @MIN_LALFRAME_VERSION@
BuildRequires: lalinference-devel >= @MIN_LALINFERENCE_VERSION@
BuildRequires: lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@
BuildRequires: lalmetaio-devel >= @MIN_LALMETAIO_VERSION@
BuildRequires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalpulsar-devel >= @MIN_LALPULSAR_VERSION@
BuildRequires: lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@
BuildRequires: make
BuildRequires: pkgconfig >= 0.18.0
BuildRequires: python2-lal >= @MIN_LAL_VERSION@
BuildRequires: python2-lalframe >= @MIN_LALFRAME_VERSION@
BuildRequires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
BuildRequires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
BuildRequires: lalburst-devel >= @MIN_LALBURST_VERSION@
BuildRequires: python2-lalburst >= @MIN_LALBURST_VERSION@
BuildRequires: lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@
BuildRequires: python2-lalinspiral >= @MIN_LALINSPIRAL_VERSION@
BuildRequires: lalpulsar-devel >= @MIN_LALPULSAR_VERSION@
BuildRequires: python2-lalpulsar >= @MIN_LALPULSAR_VERSION@
BuildRequires: lalinference-devel >= @MIN_LALINFERENCE_VERSION@
BuildRequires: python2-lalinference >= @MIN_LALINFERENCE_VERSION@
BuildRequires: help2man
BuildRequires: bc
BuildRequires: python2-rpm-macros
Requires: cfitsio
Requires: fftw
Requires: gsl
Requires: h5py
Requires: healpy
Requires: python2-six
Requires: lal >= @MIN_LAL_VERSION@
Requires: lalburst >= @MIN_LALBURST_VERSION@
Requires: lalframe >= @MIN_LALFRAME_VERSION@
Requires: lalinference >= @MIN_LALINFERENCE_VERSION@
Requires: lalinspiral >= @MIN_LALINSPIRAL_VERSION@
Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: lalpulsar >= @MIN_LALPULSAR_VERSION@
Requires: lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: less
Requires: libframe
Requires: libmetaio
Requires: python
Requires: lal >= @MIN_LAL_VERSION@
Requires: python2-h5py
Requires: python2-lal >= @MIN_LAL_VERSION@
Requires: lalframe >= @MIN_LALFRAME_VERSION@
Requires: python2-lalframe >= @MIN_LALFRAME_VERSION@
Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: python2-lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: python2-lalsimulation >= @MIN_LALSIMULATION_VERSION@
Requires: lalburst >= @MIN_LALBURST_VERSION@
Requires: python2-lalburst >= @MIN_LALBURST_VERSION@
Requires: lalinspiral >= @MIN_LALINSPIRAL_VERSION@
Requires: python2-lalinspiral >= @MIN_LALINSPIRAL_VERSION@
Requires: lalpulsar >= @MIN_LALPULSAR_VERSION@
Requires: python2-lalpulsar >= @MIN_LALPULSAR_VERSION@
Requires: lalinference >= @MIN_LALINFERENCE_VERSION@
Requires: python2-lalinference >= @MIN_LALINFERENCE_VERSION@
Requires: python2-ligo-lw
Requires: python2-ligo-segments
Requires: python-ligo-lw
Requires: python2-matplotlib
Requires: python2-numpy
Requires: python2-scipy
Requires: python2-six
Obsoletes: lalxml < 1.2.5-1
Obsoletes: lalxml-debuginfo < 1.2.5-1
Obsoletes: lalxml-devel < 1.2.5-1
......@@ -125,6 +127,9 @@ export OMPI_LIBS="-lmpi -Wl,--disable-new-dtags"
%check
%{__make} %{?_smp_mflags} V=1 VERBOSE=1 check
# check python import
env PYTHONPATH="%{buildroot}%{python2_sitearch}" \
%{__python2} -c "import %{name}"
%install
%make_install
......@@ -145,11 +150,17 @@ rm -Rf ${RPM_BUILD_DIR}/%{name}-%{version}%{?nightly:-%{nightly}}
%{_bindir}/*
%{_datadir}/lalapps/*
%{_mandir}/man1/*
%{_pkgpythondir}/*
%{_sysconfdir}/lalapps-user-env.*
%{python2_sitearch}
# dates should be formatted using: 'date +"%a %b %d %Y"'
%changelog
* Mon Dec 09 2019 Adam Mercer <adam.mercer@ligo.org> 6.25.0-2
- Packaging updates
* Wed Nov 27 2019 Adam Mercer <adam.mercer@ligo.org> 6.25.0-1
- O3b release
* Thu May 23 2019 Adam Mercer <adam.mercer@ligo.org> 6.24.0-1
- O3 Release
......
......@@ -10,9 +10,9 @@
{% set sha256 = "@SHA256@" %}
# dependencies
{% set lal_version = "6.20.0" %}
{% set lalmetaio_version = "1.5.0" %}
{% set lalsimulation_version = "1.9.0" %}
{% set lal_version = "6.21.0" %}
{% set lalmetaio_version = "1.6.0" %}
{% set lalsimulation_version = "1.10.0" %}
{% set swig_version = "3.0.7" %}
package:
......@@ -35,15 +35,15 @@ requirements:
- swig >={{ swig_version }}
host:
- gsl
- lal >={{ lal_version }}
- lalmetaio >={{ lalmetaio_version }}
- lalsimulation >={{ lalsimulation_version }}
- lal >={{ lal_version }}a0
- lalmetaio >={{ lalmetaio_version }}a0