From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH 15/16] gnu: python-ipython: Update to 4.0.0. Date: Tue, 1 Nov 2016 13:20:45 +0100 Message-ID: <20161101122046.751-16-ricardo.wurmus@mdc-berlin.de> References: <20161101122046.751-1-ricardo.wurmus@mdc-berlin.de> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1Y5j-0002So-KF for guix-devel@gnu.org; Tue, 01 Nov 2016 08:23:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1Y5i-0003eL-M7 for guix-devel@gnu.org; Tue, 01 Nov 2016 08:22:59 -0400 Received: from pegasus.bbbm.mdc-berlin.de ([141.80.25.20]:45929) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c1Y5i-0003e0-Cw for guix-devel@gnu.org; Tue, 01 Nov 2016 08:22:58 -0400 Received: from localhost (localhost [127.0.0.1]) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTP id 77BE8380DA0 for ; Tue, 1 Nov 2016 13:22:57 +0100 (CET) Received: from pegasus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (pegasus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DES6IhD1EP9I for ; Tue, 1 Nov 2016 13:22:51 +0100 (CET) Received: from HTCAONE.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pegasus.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Tue, 1 Nov 2016 13:22:51 +0100 (CET) In-Reply-To: <20161101122046.751-1-ricardo.wurmus@mdc-berlin.de> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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 | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 519b93d..12d38f1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4628,34 +4628,38 @@ 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) - (patches (search-patches "python-ipython-inputhook-ctype.patch")) - (uri (string-append "https://pypi.python.org/packages/source/i/" - "ipython/ipython-" version ".tar.gz")) + (uri (pypi-uri "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) ("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) @@ -4674,13 +4678,13 @@ tools for mocking system commands and recording calls to those.") (examples (string-append doc "/examples"))) (setenv "LANG" "en_US.utf8") (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.10.1