From dfbc33dceb803a3d54840613b08dc98f7be75f60 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Wed, 14 Jan 2015 15:42:11 +0100 Subject: gnu: python-matplotlib: Remove python-pillow input. * gnu/packages/python.scm (python-matplotlib): Remove python-pillow input as it currently is broken. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1978d1cd45..7cfbf75290 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2199,7 +2199,7 @@ that client code uses to construct the grammar directly in Python code.") ("freetype" ,freetype) ("cairo" ,cairo) ("glib" ,glib) - ("python-pillow" ,python-pillow) + ;("python-pillow" ,python-pillow) ;; FIXME: Add backends when available. ;("python-wxpython" ,python-wxpython) ;("python-pyqt" ,python-pyqt) -- cgit v1.2.3 From 3e6ccb53559c8a0cb9ea010ec747df4e5972fcd3 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Wed, 14 Jan 2015 17:02:02 +0100 Subject: gnu: python-matplotlib: Update comments. * gnu/packages/python.scm (python-matplotlib): Update comments as, with the patched 'gobject-introspection', setting LD_LIBRARY_PATH at run time is not anymore necessary. It's still necessary at build time. --- gnu/packages/python.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7cfbf75290..a1be20c21f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2170,13 +2170,6 @@ that client code uses to construct the grammar directly in Python code.") ;; at run-time the user must set this variable as follows: ;; ;; export GI_TYPELIB_PATH=~/.guix-profile/lib/girepository-1.0 - ;; - ;; 'typelib' files include references to dynamic libraries. Currently - ;; the references do not include the full path to the libraries. For - ;; this reason the user must set the LD_LIBRARY_PATH to the location of - ;; 'libgtk-3.so.0', 'libgdk-3.so.0' and 'libatk-1.0.so.0': - ;; - ;; export LD_LIBRARY_PATH=~/.guix-profile/lib ("gtk+" ,gtk+) ;; From version 1.4.0 'matplotlib' makes use of 'cairocffi' instead of ;; 'pycairo'. However, 'pygobject' makes use of a 'pycairo' 'context' @@ -2217,10 +2210,6 @@ that client code uses to construct the grammar directly in Python code.") (gtk+ (assoc-ref inputs "gtk+"))) ;; Setting these directories in the 'basedirlist' of 'setup.cfg' ;; has not effect. - ;; - ;; FIXME: setting LD_LIBRARY_PATH should be removed once we patch - ;; gobject-introspection to include the full path of shared - ;; libraries in 'typelib' files. (setenv "LD_LIBRARY_PATH" (string-append cairo "/lib:" gtk+ "/lib")) (setenv "HOME" (getcwd)) -- cgit v1.2.3 From da6ce3f1b864077002d912a22a40f31c57bc2d43 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Wed, 14 Jan 2015 18:04:17 +0100 Subject: gnu: python-scipy: Update to 0.15.0. * gnu/packages/python.scm (python-scipy): Update to 0.15.0. --- gnu/packages/python.scm | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a1be20c21f..2f518d940d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Eric Bavier -;;; Copyright © 2014 Federico Beffa +;;; Copyright © 2014, 2015 Federico Beffa ;;; ;;; This file is part of GNU Guix. ;;; @@ -2271,30 +2271,18 @@ toolkits.") ,@(alist-delete "python-numpydoc" (package-inputs matplotlib))))))) -;; Scipy 0.14.0 with Numpy 0.19.X fails several tests. This is known and -;; planned to be fixed in 0.14.1. It is claimed that the failures can safely -;; be ignored: -;; http://mail.scipy.org/pipermail/scipy-dev/2014-September/020043.html -;; https://github.com/scipy/scipy/issues/3853 -;; -;; The main test suite procedure prints the summary message: -;; -;; Ran 16412 tests in 245.033s -;; FAILED (KNOWNFAIL=277, SKIP=921, errors=327, failures=42) -;; -;; However, it still does return normally. (define-public python-scipy (package (name "python-scipy") - (version "0.14.0") + (version "0.15.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/scipy" - "/scipy-" version ".tar.gz")) + "/scipy-" version ".tar.xz")) (sha256 (base32 - "053bmz4qmnk4dmxvspfak8r10rpmy6mzwfzgy33z338ppzka6hab")))) + "0fsqi05s035d7p6s8h3h2pvk1axias16chy17rw9l1bxvrfhmncf")))) (build-system python-build-system) (inputs `(("python-numpy" ,python-numpy) -- cgit v1.2.3