Merge lp:~jtaylor/ubuntu/raring/python-numpy/autopkgtest into lp:ubuntu/raring/python-numpy

[Julian Taylor]

I'm unsure about the openblas test
it fails in (auto-package-test) virtual machines as they lie about their cpu but works fine on real hardware

[Julian Taylor (jtaylor)]

I fixed two issues in openblas concerning the VM's:
https://github.com/xianyi/OpenBLAS/pull/169
https://github.com/xianyi/OpenBLAS/pull/170

so it should in principle be VM safe now

but this issue remains, but its not related to our autotest infrastructure
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=696000

[lp:~jtaylor/ubuntu/raring/python-numpy/autopkgtest]

32. By Julian Taylor on 2012-12-16

redirect python-dbg stderr to stdout

33. By Julian Taylor on 2012-12-16

only redirect python-dbg

34. By Julian Taylor on 2012-12-18

clarify comment for needs-root restriction

[Iain Lane (laney)]

Uploaded, thank you.

It'd be nice if you could send these to Debian.

review: Approve

[Julian Taylor (jtaylor)]

thats already done:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=695881

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 22:47:07 +0000
+++ debian/changelog	2012-12-18 17:56:20 +0000
@@ -1,3 +1,10 @@
+python-numpy (1:1.7.0~b2-1ubuntu6) raring; urgency=low
+
+  * fix installation f2py3
+  * add autopkgtests
+
+ -- Julian Taylor <[e-mail]>  Fri, 14 Dec 2012 12:46:11 +0100
+
 python-numpy (1:1.7.0~b2-1ubuntu5) raring; urgency=low
 
   * Drop python3.2.

=== modified file 'debian/control'
--- debian/control	2012-10-26 12:33:51 +0000
+++ debian/control	2012-12-18 17:56:20 +0000
@@ -11,6 +11,7 @@
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/numpy/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/numpy/trunk/
 Homepage: http://numpy.scipy.org/
+XS-Testsuite: autopkgtest
 
 Package: python-numpy
 Architecture: any

=== modified file 'debian/python3-numpy-dbg.install'
--- debian/python3-numpy-dbg.install	2012-03-19 19:38:13 +0000
+++ debian/python3-numpy-dbg.install	2012-12-18 17:56:20 +0000
@@ -1,2 +1,3 @@
+usr/bin/f2py3-dbg
 usr/bin/f2py3.?-dbg
 usr/lib/python3*/*-packages/*/*/*.cpython-*d*.so

=== modified file 'debian/python3-numpy.install'
--- debian/python3-numpy.install	2012-06-02 18:44:16 +0000
+++ debian/python3-numpy.install	2012-12-18 17:56:20 +0000
@@ -1,4 +1,5 @@
 debian/dh_numpy3 usr/bin
+usr/bin/f2py3
 usr/bin/f2py3.?
 usr/lib/python3*/*-packages/*/*/*.cpython-3?[!d]*.so
 usr/lib/python3*/*-packages/*/*/*/libnpymath.a

=== added directory 'debian/tests'
=== added symlink 'debian/tests/atlas'
=== target is u'openblas'
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2012-12-18 17:56:20 +0000
@@ -0,0 +1,18 @@
+Tests: python2
+Depends: python-numpy, python-all, python-nose, python-tz
+
+Tests: python3
+Depends: 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
+
+#needs root for update-alternatives
+Tests: atlas
+Restrictions: needs-root
+Depends: python-numpy, python-all, python-nose, python-tz, libatlas3-base
+
+Tests: f2py
+Depends: gcc, 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

=== added file 'debian/tests/f2py'
--- debian/tests/f2py	1970-01-01 00:00:00 +0000
+++ debian/tests/f2py	2012-12-18 17:56:20 +0000
@@ -0,0 +1,23 @@
+#!/bin/sh
+set -efu
+
+PYS=$(pyversions -rv 2>/dev/null)" "$(py3versions -rv 2>/dev/null)
+
+cd "$ADTTMP"
+
+cat << EOF > hello.f
+C File hello.f
+      integer function foo (a)
+      integer a
+      foo = a + 1
+      end
+EOF
+
+for py in " " 3 $PYS; do
+    [ "$py" = " " ] && py=""
+    echo "=== f2py$py ==="
+    f2py$py -c -m hello hello.f 2>&1
+    python$py -c 'import hello; assert hello.foo(4) == 5'
+    f2py$py-dbg -c -m hello hello.f 2>&1
+    python$py-dbg -c 'import hello; assert hello.foo(4) == 5' 2>&1
+done

=== added file 'debian/tests/openblas'
--- debian/tests/openblas	1970-01-01 00:00:00 +0000
+++ debian/tests/openblas	2012-12-18 17:56:20 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+set -efu
+blaslib=$(update-alternatives --list libblas.so.3 | grep $(basename $0))
+update-alternatives --set libblas.so.3 $blaslib
+
+# one python is enough
+PYS=${PYS:-"$(pyversions -d 2>/dev/null)"}
+
+#test only modules that link against libblas
+PYS=$PYS TESTPKG=numpy.core debian/tests/python2
+PYS=$PYS TESTPKG=numpy.linalg debian/tests/python2

=== added file 'debian/tests/python2'
--- debian/tests/python2	1970-01-01 00:00:00 +0000
+++ debian/tests/python2	2012-12-18 17:56:20 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -efu
+
+PYS=${PYS:-"$(pyversions -r 2>/dev/null)"}
+TESTPKG=${TESTPKG:-numpy}
+
+cd "$ADTTMP"
+
+for py in $PYS; do
+    echo "=== $py ==="
+    $py -c "import $TESTPKG; $TESTPKG.test(verbose=2)" 2>&1
+done

=== added file 'debian/tests/python3'
--- debian/tests/python3	1970-01-01 00:00:00 +0000
+++ debian/tests/python3	2012-12-18 17:56:20 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -efu
+
+PYS=${PYS:-"$(py3versions -r 2>/dev/null)"}
+TESTPKG=${TESTPKG:-numpy}
+
+cd "$ADTTMP"
+
+for py in $PYS; do
+    echo "=== $py ==="
+    $py -c "import $TESTPKG; $TESTPKG.test(verbose=2)" 2>&1
+done