[PATCH] Update IPython.

[PATCH] Update IPython.

[Ricardo Wurmus]

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

Hi Guix,

a lot of changes were required to update IPython.  I took the
opportunity to move most of the inputs to propagated-inputs, as they are
very likely required to be available at runtime.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-ipython-Update-to-4.0.0.patch --]
[-- Type: text/x-patch, Size: 3851 bytes --]

From 1b2aa8a0749e145095a83a14f37606f5954ae657 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Mon, 28 Sep 2015 15:30:26 +0200
Subject: [PATCH] gnu: python-ipython: Update to 4.0.0.

* gnu/packages/python.scm (python-ipython): Update to 4.0.0.
  [inputs]: Keep only "readline" and "which"; move the remaining inputs
  to propagated-inputs, except for "python-requests" and "python-nose"
  which are moved to native-inputs.
  [propagated-inputs]: Add python-pexpect, python-pickleshare,
  python-simplegeneric, python-traitlets, python-ipykernel.
  [native-inputs]: Add "python-testpath".
  [arguments]: Enable building of HTML documentation.
---
 gnu/packages/python.scm | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index f0d9577..bbe983e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3997,33 +3997,39 @@ tools for mocking system commands and recording calls to those.")
 (define-public python-ipython
   (package
     (name "python-ipython")
-    (version "3.2.1")
+    (version "4.0.0")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "https://pypi.python.org/packages/source/i/"
                           "ipython/ipython-" version ".tar.gz"))
       (sha256
-       (base32 "0xwin0sa9n0cabx4cq1ibf5ldsiw5dyimibla82kicz5gbpas4y9"))))
+       (base32 "1npl8g6bfsff9j938ypx0q5fyzy2l8lp0jl8skjjj2zv0z27dlig"))))
     (build-system python-build-system)
     (outputs '("out" "doc"))
     (propagated-inputs
      `(("python-pyzmq" ,python-pyzmq)
-       ("python-terminado" ,python-terminado)))
-    (inputs
-     `(("readline" ,readline)
-       ("which" ,which)
+       ("python-terminado" ,python-terminado)
        ("python-matplotlib" ,python-matplotlib)
        ("python-numpy" ,python-numpy-bootstrap)
        ("python-numpydoc" ,python-numpydoc)
        ("python-jinja2" ,python-jinja2)
        ("python-mistune" ,python-mistune)
+       ("python-pexpect" ,python-pexpect)
+       ("python-pickleshare" ,python-pickleshare)
+       ("python-simplegeneric" ,python-simplegeneric)
        ("python-jsonschema" ,python-jsonschema)
-       ("python-pygments" ,python-pygments)
-       ("python-requests" ,python-requests) ;; for tests
-       ("python-nose" ,python-nose)))
+       ("python-traitlets" ,python-traitlets)
+       ("python-ipykernel" ,python-ipykernel)
+       ("python-pygments" ,python-pygments)))
+    (inputs
+     `(("readline" ,readline)
+       ("which" ,which)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("python-requests" ,python-requests) ;; for tests
+       ("python-testpath" ,python-testpath)
+       ("python-nose" ,python-nose)
        ("python-sphinx" ,python-sphinx)
        ("texlive" ,texlive)
        ("texinfo" ,texinfo)
@@ -4042,13 +4048,13 @@ tools for mocking system commands and recording calls to those.")
                    (examples (string-append doc "/examples")))
               (setenv "LANG" "en_US.UTF-8")
               (with-directory-excursion "docs"
-                ;; FIXME: html and pdf fail to build
-                ;; (system* "make" "html")
-                ;; (system* "make" "pdf" "PAPER=a4")
+                ;; FIXME: pdf fails to build
+                ;;(system* "make" "pdf" "PAPER=a4")
+                (system* "make" "html")
                 (system* "make" "info"))
               (copy-recursively "docs/man" man1)
               (copy-recursively "examples" examples)
-              ;; (copy-recursively "docs/build/html" html)
+              (copy-recursively "docs/build/html" html)
               ;; (copy-file "docs/build/latex/ipython.pdf"
               ;;            (string-append doc "/ipython.pdf"))
               (mkdir-p info)
-- 
2.1.0

Re: [PATCH] Update IPython.

[Ludovic Courtès]

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

> From 1b2aa8a0749e145095a83a14f37606f5954ae657 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
> Date: Mon, 28 Sep 2015 15:30:26 +0200
> Subject: [PATCH] gnu: python-ipython: Update to 4.0.0.
>
> * gnu/packages/python.scm (python-ipython): Update to 4.0.0.
>   [inputs]: Keep only "readline" and "which"; move the remaining inputs
>   to propagated-inputs, except for "python-requests" and "python-nose"
>   which are moved to native-inputs.
>   [propagated-inputs]: Add python-pexpect, python-pickleshare,
>   python-simplegeneric, python-traitlets, python-ipykernel.
>   [native-inputs]: Add "python-testpath".
>   [arguments]: Enable building of HTML documentation.

LGTM, thanks!

Ludo’.

Re: [PATCH] Update IPython.

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> skribis:
>
>> From 1b2aa8a0749e145095a83a14f37606f5954ae657 Mon Sep 17 00:00:00 2001
>> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
>> Date: Mon, 28 Sep 2015 15:30:26 +0200
>> Subject: [PATCH] gnu: python-ipython: Update to 4.0.0.
>>
>> * gnu/packages/python.scm (python-ipython): Update to 4.0.0.
>>   [inputs]: Keep only "readline" and "which"; move the remaining inputs
>>   to propagated-inputs, except for "python-requests" and "python-nose"
>>   which are moved to native-inputs.
>>   [propagated-inputs]: Add python-pexpect, python-pickleshare,
>>   python-simplegeneric, python-traitlets, python-ipykernel.
>>   [native-inputs]: Add "python-testpath".
>>   [arguments]: Enable building of HTML documentation.
>
> LGTM, thanks!

Thanks for checking.  I just noticed that I haven’t submitted the
patches to add packages for all the new inputs.  I’ll do this in a
separate email.

~~ Ricardo