[PATCH] Fix scipy

[PATCH] Fix scipy

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

The attached patch fixes python{,2}-scipy.  Currently, it does not
propagate Python modules it depends on at runtime, such as numpy.

I suspect that we need to fix many more Python packages in a similar
manner.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-scipy-python2-scipy-Propagate-Python-inpu.patch --]
[-- Type: text/x-patch, Size: 2586 bytes --]

From 73199a178d34eb5202906ea7ef6921c09d42ea28 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 13 Oct 2015 13:29:49 +0200
Subject: [PATCH] gnu: python-scipy, python2-scipy: Propagate Python inputs.

* gnu/packages/python.scm (python-scipy)[inputs]: Move "python-numpy",
  "python-matplotlib", and "python-pyparsing" to propagated-inputs; move
  "python-nose" and "python-sphinx" to native-inputs.
  [propagated-inputs]: New field.
  [native-inputs]: Move "python-nose" and "python-sphinx" from inputs
  field here.
  (python2-scipy): Modify propagated-inputs instead of inputs field.
---
 gnu/packages/python.scm | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 72d353d..5c44a92 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3244,16 +3244,17 @@ functions.")
         (base32
          "0fsqi05s035d7p6s8h3h2pvk1axias16chy17rw9l1bxvrfhmncf"))))
     (build-system python-build-system)
-    (inputs
+    (propagated-inputs
      `(("python-numpy" ,python-numpy)
        ("python-matplotlib" ,python-matplotlib)
-       ("python-pyparsing" ,python-pyparsing)
-       ("python-nose" ,python-nose)
-       ("python-sphinx" ,python-sphinx)
-       ("lapack" ,lapack)
+       ("python-pyparsing" ,python-pyparsing)))
+    (inputs
+     `(("lapack" ,lapack)
        ("openblas" ,openblas)))
     (native-inputs
-     `(("gfortran" ,gfortran)
+     `(("python-nose" ,python-nose)
+       ("python-sphinx" ,python-sphinx)
+       ("gfortran" ,gfortran)
        ("texlive" ,texlive)
        ("perl" ,perl)))
     (outputs '("out" "doc"))
@@ -3322,11 +3323,12 @@ routines such as routines for numerical integration and optimization.")
   (let ((scipy (package-with-python2 python-scipy)))
     (package (inherit scipy)
       ;; Use packages customized for python-2.
-      (inputs `(("python2-matplotlib" ,python2-matplotlib)
-                ("python2-numpy" ,python2-numpy)
-                ,@(alist-delete "python-matplotlib"
-                                (alist-delete "python-numpy"
-                                              (package-inputs scipy))))))))
+      (propagated-inputs
+       `(("python2-matplotlib" ,python2-matplotlib)
+         ("python2-numpy" ,python2-numpy)
+         ,@(alist-delete "python-matplotlib"
+                         (alist-delete "python-numpy"
+                                       (package-propagated-inputs scipy))))))))
 
 (define-public python-sqlalchemy
   (package
-- 
2.1.0

Re: [PATCH] Fix scipy

[Cyril Roelandt]

On 10/13/2015 01:37 PM, Ricardo Wurmus wrote:
> I suspect that we need to fix many more Python packages in a similar
> manner.
> 

Yes, probably. I think one has to grep a lot when adding a new package,
in order to see whether the inputs are actually imported in the code.

Cyril.

Re: [PATCH] Fix scipy

[Ludovic Courtès]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:

> From 73199a178d34eb5202906ea7ef6921c09d42ea28 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
> Date: Tue, 13 Oct 2015 13:29:49 +0200
> Subject: [PATCH] gnu: python-scipy, python2-scipy: Propagate Python inputs.
>
> * gnu/packages/python.scm (python-scipy)[inputs]: Move "python-numpy",
>   "python-matplotlib", and "python-pyparsing" to propagated-inputs; move
>   "python-nose" and "python-sphinx" to native-inputs.
>   [propagated-inputs]: New field.
>   [native-inputs]: Move "python-nose" and "python-sphinx" from inputs
>   field here.
>   (python2-scipy): Modify propagated-inputs instead of inputs field.

Sure, thanks.

Ludo’.