[PATCH 1/3] gnu: python-ipython: Update to 4.0.3

[PATCH 1/3] gnu: python-ipython: Update to 4.0.3

[Hartmut Goebel]

* gnu/packages/python.scm (python-ipython, python2-ipython): Update to
version 4.0.3.
---
 gnu/packages/python.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0df9496..67022d2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4705,13 +4705,13 @@ tools for mocking system commands and recording calls to those.")
 (define-public python-ipython
   (package
     (name "python-ipython")
-    (version "4.0.0")
+    (version "4.0.3")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "ipython" version ".tar.gz"))
        (sha256
-        (base32 "1npl8g6bfsff9j938ypx0q5fyzy2l8lp0jl8skjjj2zv0z27dlig"))))
+        (base32 "1h2gp1p06sww9rzfkfzqy489bh47gj3910y2b1wdk3dcx1cqz4is"))))
     (build-system python-build-system)
     (outputs '("out" "doc"))
     (propagated-inputs
-- 
2.7.4

[PATCH 2/3] gnu: python-ipython-genutils: Update description.

[Hartmut Goebel]

* gnu/packages/python.scm (python-ipython-genutils)[description]: Add
deprecation note.
---
 gnu/packages/python.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 67022d2..66c297c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4536,7 +4536,12 @@ standard library.")
     (home-page "http://ipython.org")
     (synopsis "Vestigial utilities from IPython")
     (description
-     "This package provides retired utilities from IPython.")
+     "This package provides retired utilities from IPython.  No packages outside IPython/Jupyter should depend on it.
+
+This package shouldn't exist.  It contains some common utilities shared by
+Jupyter and IPython projects during The Big Split.  As soon as possible, those
+packages will remove their dependency on this, and this package will go
+away.")
     (license license:bsd-3)))
 
 (define-public python2-ipython-genutils
-- 
2.7.4

[PATCH 3/3] gnu: python2-notebook: Fix build.

[Hartmut Goebel]

* gnu/packages/python.scm (python2-notebook)[properties]: Add
python2-variant.
(python2-notebook)[native-packages] add python2-mock. [arguments] Add
phase "disable-test-case" for disabling a failing test. immediately
---
 gnu/packages/python.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 66c297c..7556858 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6864,10 +6864,28 @@ convert an @code{.ipynb} notebook file into various static formats including:
     (description
      "The Jupyter HTML notebook is a web-based notebook environment for
 interactive computing.")
+    (properties `((python2-variant . ,(delay python2-notebook))))
     (license license:bsd-3)))
 
 (define-public python2-notebook
-  (package-with-python2 python-notebook))
+  (let ((base (package-with-python2
+                (strip-python2-variant python-notebook))))
+    (package (inherit base)
+      (native-inputs
+       `(("python2-mock" ,python2-mock)
+         ,@(package-native-inputs base)))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base)
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (add-before 'check 'disable-test-case
+              ;; The test requires network access to localhost. Curiously it
+              ;; files with Python 2 only. Simply make the test-case return
+              ;; immediately.
+              (lambda _
+                (substitute*
+                    "notebook/services/nbconvert/tests/test_nbconvert_api.py"
+                  (("formats = self.nbconvert_api") "return #")))))))))))
 
 (define-public python-widgetsnbextension
   (package
-- 
2.7.4

Re: [PATCH 1/3] gnu: python-ipython: Update to 4.0.3

[Leo Famulari]

On Mon, Dec 05, 2016 at 01:21:03PM +0100, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python-ipython, python2-ipython): Update to
> version 4.0.3.

LGTM

> ---
>  gnu/packages/python.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 0df9496..67022d2 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -4705,13 +4705,13 @@ tools for mocking system commands and recording calls to those.")
>  (define-public python-ipython
>    (package
>      (name "python-ipython")
> -    (version "4.0.0")
> +    (version "4.0.3")
>      (source
>       (origin
>         (method url-fetch)
>         (uri (pypi-uri "ipython" version ".tar.gz"))
>         (sha256
> -        (base32 "1npl8g6bfsff9j938ypx0q5fyzy2l8lp0jl8skjjj2zv0z27dlig"))))
> +        (base32 "1h2gp1p06sww9rzfkfzqy489bh47gj3910y2b1wdk3dcx1cqz4is"))))
>      (build-system python-build-system)
>      (outputs '("out" "doc"))
>      (propagated-inputs
> -- 
> 2.7.4
> 
> 

Re: [PATCH 3/3] gnu: python2-notebook: Fix build.

[Leo Famulari]

On Mon, Dec 05, 2016 at 01:21:05PM +0100, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python2-notebook)[properties]: Add
> python2-variant.
> (python2-notebook)[native-packages] add python2-mock. [arguments] Add
> phase "disable-test-case" for disabling a failing test. immediately

s/ immediately//

>  (define-public python2-notebook
> -  (package-with-python2 python-notebook))
> +  (let ((base (package-with-python2
> +                (strip-python2-variant python-notebook))))
> +    (package (inherit base)
> +      (native-inputs
> +       `(("python2-mock" ,python2-mock)
> +         ,@(package-native-inputs base)))
> +      (arguments
> +       (substitute-keyword-arguments (package-arguments base)
> +         ((#:phases phases)
> +          `(modify-phases ,phases
> +             (add-before 'check 'disable-test-case
> +              ;; The test requires network access to localhost. Curiously it
> +              ;; files with Python 2 only. Simply make the test-case return

s/files/fails

Otherwise LGTM, thanks! I was just noticing this issue :)

Re: [PATCH 2/3] gnu: python-ipython-genutils: Update description.

[Leo Famulari]

On Mon, Dec 05, 2016 at 01:21:04PM +0100, Hartmut Goebel wrote:
> * gnu/packages/python.scm (python-ipython-genutils)[description]: Add
> deprecation note.
> ---
>  gnu/packages/python.scm | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 67022d2..66c297c 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -4536,7 +4536,12 @@ standard library.")
>      (home-page "http://ipython.org")
>      (synopsis "Vestigial utilities from IPython")
>      (description
> -     "This package provides retired utilities from IPython.")
> +     "This package provides retired utilities from IPython.  No packages outside IPython/Jupyter should depend on it.
> +
> +This package shouldn't exist.  It contains some common utilities shared by
> +Jupyter and IPython projects during The Big Split.  As soon as possible, those
> +packages will remove their dependency on this, and this package will go
> +away.")

LGTM. Can you add a TODO comment for those of us who periodically for
things to do? :)

Re: [PATCH 3/3] gnu: python2-notebook: Fix build.

[Hartmut Goebel]

Am 05.12.2016 um 22:44 schrieb Leo Famulari:

> Otherwise LGTM, thanks! 

Push all three with you comments resolved. Thanks for reviewing.

> I was just noticing this issue :) 

:-)

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |