From bb8f8f86771bbab6f5da0a5c61a1b0ae6a1ce736 Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kipp.cannon@ligo.org>
Date: Tue, 5 Mar 2019 16:03:52 +0900
Subject: [PATCH] gstlal, gstlal-ugly, gstlal-inspiral: require numpy >= 1.7
---
gstlal-inspiral/configure.ac | 1 +
gstlal-inspiral/debian/control.in | 2 +-
gstlal-inspiral/gstlal-inspiral.spec.in | 2 +-
gstlal-ugly/configure.ac | 1 +
gstlal-ugly/debian/control.in | 4 ++--
gstlal-ugly/gstlal-ugly.spec.in | 2 +-
gstlal/configure.ac | 1 +
gstlal/debian/control.in | 4 ++--
gstlal/gstlal.spec.in | 4 ++--
9 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/gstlal-inspiral/configure.ac b/gstlal-inspiral/configure.ac
index 6796092e7a..1fd84ac466 100644
--- a/gstlal-inspiral/configure.ac
+++ b/gstlal-inspiral/configure.ac
@@ -230,6 +230,7 @@ to your GI_TYPELIB_PATH environment variable.])
#
+AC_SUBST([MIN_NUMPY_VERSION], [1.7.0])
AX_PYTHON_MODULE(numpy, fatal)
NUMPY_CFLAGS=-I`$PYTHON -c "import numpy;print (numpy.get_include());"`
old_CFLAGS="$CFLAGS"
diff --git a/gstlal-inspiral/debian/control.in b/gstlal-inspiral/debian/control.in
index 095ba8c6a3..2278302b2f 100644
--- a/gstlal-inspiral/debian/control.in
+++ b/gstlal-inspiral/debian/control.in
@@ -51,7 +51,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
python-ligo-gracedb (>= 1.11),
python-ligo-lw (>= @MIN_LIGO_LW_VERSION@),
python-ligo-segments (>= @MIN_LIGO_SEGMENTS_VERSION@),
- python-numpy,
+ python-numpy (>= @MIN_NUMPY_VERSION@),
python-scipy
Description: GStreamer for GW data analysis (inspiral parts)
This package provides a variety of gstreamer elements for
diff --git a/gstlal-inspiral/gstlal-inspiral.spec.in b/gstlal-inspiral/gstlal-inspiral.spec.in
index 084ddf8d25..945603e474 100644
--- a/gstlal-inspiral/gstlal-inspiral.spec.in
+++ b/gstlal-inspiral/gstlal-inspiral.spec.in
@@ -18,7 +18,7 @@ Requires: %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@
Requires: %{gstreamername}-plugins-good >= @MIN_GSTREAMER_VERSION@
Requires: %{gstreamername}-plugins-bad-free
Requires: h5py
-Requires: numpy
+Requires: numpy >= @MIN_NUMPY_VERSION@
Requires: scipy
Requires: lal >= @MIN_LAL_VERSION@
Requires: lal-python >= @MIN_LAL_VERSION@
diff --git a/gstlal-ugly/configure.ac b/gstlal-ugly/configure.ac
index a51aa6dbd9..c0b2824ac8 100644
--- a/gstlal-ugly/configure.ac
+++ b/gstlal-ugly/configure.ac
@@ -283,6 +283,7 @@ to your GI_TYPELIB_PATH environment variable.])
#
+AC_SUBST([MIN_NUMPY_VERSION], [1.7.0])
AX_PYTHON_MODULE(numpy, fatal)
NUMPY_CFLAGS=-I`$PYTHON -c "import numpy;print (numpy.get_include());"`
old_CFLAGS="$CFLAGS"
diff --git a/gstlal-ugly/debian/control.in b/gstlal-ugly/debian/control.in
index 5de4ec0d37..2c1a4360db 100644
--- a/gstlal-ugly/debian/control.in
+++ b/gstlal-ugly/debian/control.in
@@ -29,7 +29,7 @@ Build-Depends:
python-all-dev (>= @MIN_PYTHON_VERSION@),
python-glue (>= @MIN_GLUE_VERSION@),
python-glue-ligolw-tools,
- python-numpy
+ python-numpy (>= @MIN_NUMPY_VERSION@)
Package: gstlal-ugly
Architecture: any
@@ -54,7 +54,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
python-h5py,
python-ligo-lw (>= @MIN_LIGO_LW_VERSION@),
python-ligo-segments (>= @MIN_LIGO_SEGMENTS_VERSION@),
- python-numpy,
+ python-numpy (>= @MIN_NUMPY_VERSION@),
python-scipy
Description: GStreamer for GW data analysis (in-development parts)
This package provides a variety of GStreamer elements for
diff --git a/gstlal-ugly/gstlal-ugly.spec.in b/gstlal-ugly/gstlal-ugly.spec.in
index befdd971a2..09041f5537 100644
--- a/gstlal-ugly/gstlal-ugly.spec.in
+++ b/gstlal-ugly/gstlal-ugly.spec.in
@@ -18,7 +18,7 @@ Requires: %{gstreamername}-plugins-base >= @MIN_GSTREAMER_VERSION@
Requires: %{gstreamername}-plugins-good >= @MIN_GSTREAMER_VERSION@
Requires: %{gstreamername}-plugins-bad-free
Requires: h5py
-Requires: numpy
+Requires: numpy >= @MIN_NUMPY_VERSION@
Requires: scipy
Requires: lal >= @MIN_LAL_VERSION@
Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
diff --git a/gstlal/configure.ac b/gstlal/configure.ac
index 3f8a1d98cf..6dd4e8958c 100644
--- a/gstlal/configure.ac
+++ b/gstlal/configure.ac
@@ -289,6 +289,7 @@ fi
#
+AC_SUBST([MIN_NUMPY_VERSION], [1.7.0])
AX_PYTHON_MODULE(numpy, fatal)
NUMPY_CFLAGS=-I`$PYTHON -c "import numpy;print (numpy.get_include());"`
old_CFLAGS="$CFLAGS"
diff --git a/gstlal/debian/control.in b/gstlal/debian/control.in
index 2d7b65b390..18ab15e7b0 100644
--- a/gstlal/debian/control.in
+++ b/gstlal/debian/control.in
@@ -28,7 +28,7 @@ Build-Depends:
pkg-config,
python-all-dev (>= @MIN_PYTHON_VERSION@),
python-gi-dev (>= @MIN_PYGOBJECT_VERSION@),
- python-numpy-dev,
+ python-numpy-dev (>= @MIN_NUMPY_VERSION@),
zlib1g-dev
Package: gstlal
@@ -65,7 +65,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
python-gst-1.0,
python-ligo-lw (>= @MIN_LIGO_LW_VERSION@),
python-ligo-segments (>= @MIN_LIGO_SEGMENTS_VERSION@),
- python-numpy,
+ python-numpy (>= @MIN_NUMPY_VERSION@),
python-scipy,
zlib1g
# FIXME: gstreamer1.0-python3-plugin-loader is *in fact* a dependency, but
diff --git a/gstlal/gstlal.spec.in b/gstlal/gstlal.spec.in
index 0a4c139fe1..d3b38f1a30 100644
--- a/gstlal/gstlal.spec.in
+++ b/gstlal/gstlal.spec.in
@@ -30,7 +30,7 @@ Requires: lalburst >= @MIN_LALBURST_VERSION@
Requires: lalmetaio >= @MIN_LALMETAIO_VERSION@
Requires: lalinspiral >= @MIN_LALINSPIRAL_VERSION@
Requires: lalsimulation >= @MIN_LALSIMULATION_VERSION@
-Requires: numpy
+Requires: numpy > @MIN_NUMPY_VERSION@
Requires: orc >= @MIN_ORC_VERSION@
Requires: python >= @MIN_PYTHON_VERSION@
Requires: python-%{gstreamername}
@@ -53,7 +53,7 @@ BuildRequires: lalburst-devel >= @MIN_LALBURST_VERSION@
BuildRequires: lalinspiral-devel >= @MIN_LALINSPIRAL_VERSION@
BuildRequires: lalmetaio-devel >= @MIN_LALMETAIO_VERSION@
BuildRequires: lalsimulation-devel >= @MIN_LALSIMULATION_VERSION@
-BuildRequires: numpy
+BuildRequires: numpy >= @MIN_NUMPY_VERSION@
BuildRequires: orc >= @MIN_ORC_VERSION@
BuildRequires: python-devel >= @MIN_PYTHON_VERSION@
# needed for gstpythonplugin.c remove when we remove that plugin from gstlal
--
GitLab