[Python-modules-commits] [python-numpy] 14/17: fix autopkg test dependencies, and atlas and openblas test for multi-arch library locations; Closes: #876006

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository python-numpy.

commit 4a399fa42042e89f8cb3cb765e06220bf31b086e
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Nov 26 10:48:12 2017 -0500

    fix autopkg test dependencies, and atlas and openblas test for multi-arch library locations; Closes: #876006
---
 debian/changelog      | 5 ++++-
 debian/tests/atlas    | 5 +++--
 debian/tests/control  | 9 +++++----
 debian/tests/openblas | 5 +++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e44f50f..a95c5fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ python-numpy (1:1.13.3-1) UNRELEASED; urgency=medium
     - bump Standards-Version to 4.1.1 (no changes needed)
     - remove Prio: extra from debug packages
   * use python3-sphinx to build doc
+  * debian/tests/*
+    - fix autopkg test dependencies, and atlas and openblas test for multi-arch
+      library locations; Closes: #876006
 
- -- Sandro Tosi <morph at debian.org>  Sun, 26 Nov 2017 10:42:50 -0500
+ -- Sandro Tosi <morph at debian.org>  Sun, 26 Nov 2017 10:47:14 -0500
 
 python-numpy (1:1.13.1-1) unstable; urgency=medium
 
diff --git a/debian/tests/atlas b/debian/tests/atlas
index c4b9eb2..377b703 100755
--- a/debian/tests/atlas
+++ b/debian/tests/atlas
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -efu
-blaslib=$(update-alternatives --list libblas.so.3 | grep $(basename $0))
-update-alternatives --set libblas.so.3 $blaslib
+ma=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+blaslib=$(update-alternatives --list libblas.so.3-$ma | grep $(basename $0))
+update-alternatives --set libblas.so.3-$ma $blaslib
 
 # one python is enough
 PYS=${PYS:-"$(pyversions -d 2>/dev/null)"}
diff --git a/debian/tests/control b/debian/tests/control
index 9f99e02..9b9ba02 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,23 +1,24 @@
 Tests: python2
-Depends: python-numpy, python-all, python-nose, python-tz
+Depends: build-essential, python-numpy, python-all, python-nose, python-tz
 
 Tests: python3
-Depends: python3-numpy, python3-all, python3-nose, python3-tz
+Depends: build-essential, python3-numpy, python3-all, python3-nose, python3-tz
 
 #needs root for update-alternatives
 Tests: openblas
 Restrictions: needs-root
-Depends: python-numpy, python-all, python-nose, python-tz, libopenblas-base
+Depends: python-numpy, python-all, python-nose, python-tz, libopenblas-base, dpkg-dev, gcc
 
 #needs root for update-alternatives
 Tests: atlas
 Restrictions: needs-root
-Depends: python-numpy, python-all, python-nose, python-tz, libatlas3-base
+Depends: python-numpy, python-all, python-nose, python-tz, libatlas3-base, dpkg-dev, gcc
 
 Tests: f2py
 Depends: build-essential, gfortran, python-numpy, python-numpy-dbg, python-all, python-all-dbg, python-all-dev, python3-numpy, python3-numpy-dbg, python3-all, python3-all-dbg, python3-all-dev
 
 Tests: distutils
+Restrictions: allow-stderr
 Depends: build-essential, libfftw3-dev, python-numpy
 
 Tests: capi
diff --git a/debian/tests/openblas b/debian/tests/openblas
index c4b9eb2..377b703 100755
--- a/debian/tests/openblas
+++ b/debian/tests/openblas
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -efu
-blaslib=$(update-alternatives --list libblas.so.3 | grep $(basename $0))
-update-alternatives --set libblas.so.3 $blaslib
+ma=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+blaslib=$(update-alternatives --list libblas.so.3-$ma | grep $(basename $0))
+update-alternatives --set libblas.so.3-$ma $blaslib
 
 # one python is enough
 PYS=${PYS:-"$(pyversions -d 2>/dev/null)"}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-numpy.git