02/18: gnu: vigra: Fix FTBFS with Numpy >= 1.15.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 436969904cef613b2fa0809cfa453d3db7e18d52
Author: Marius Bakke <address@hidden>
Date:   Tue Sep 4 13:31:41 2018 +0200

    gnu: vigra: Fix FTBFS with Numpy >= 1.15.
    
    * gnu/packages/image.scm (vigra)[arguments]: Disable one more test.
---
 gnu/packages/image.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 03f08a6..d3fad5d 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -832,11 +832,15 @@ graphics image formats like PNG, BMP, JPEG, TIFF and 
others.")
     `(#:test-target "check"
       #:phases
       (modify-phases %standard-phases
-        ;; See https://github.com/ukoethe/vigra/issues/432
-        (add-after 'unpack 'disable-broken-test
+        (add-after 'unpack 'disable-broken-tests
           (lambda _
+            ;; See https://github.com/ukoethe/vigra/issues/432
             (substitute* "test/fourier/CMakeLists.txt"
               (("VIGRA_ADD_TEST.*") ""))
+            ;; This test fails with Numpy 1.15:
+            ;; <https://github.com/ukoethe/vigra/issues/436>.
+            (substitute* "vigranumpy/test/CMakeLists.txt"
+              (("test1\\.py") ""))
             #t)))
       #:configure-flags
         (list "-Wno-dev" ; suppress developer mode with lots of warnings