[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/05: gnu: python-matplotlib: Update to 2.0.0.
|
From: |
Marius Bakke |
|
Subject: |
03/05: gnu: python-matplotlib: Update to 2.0.0. |
|
Date: |
Mon, 6 Mar 2017 17:26:47 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 4535a93adb225a8b0ed777b922e45bd59068f440
Author: Thomas Danckaert <address@hidden>
Date: Tue Feb 21 22:18:45 2017 +0100
gnu: python-matplotlib: Update to 2.0.0.
* gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Update to
2.0.0.
[source]: Remove Tk backend patch, use Github instead of Sourceforge.
[outputs]: Remove "doc" output.
[inputs]: Add python-pyqt.
[propagated-inputs]: Add python-cycler.
[native-inputs]: Remove python-sphinx, python-numpydoc, texlive and texinfo.
(python2-matplotlib)[native-inputs]: Add python2-functools32 and
python2-subprocess32.
(python-matplotlib-documentation, python2-matplotlib-documentation): New
variables.
* gnu/packages/patches/matplotlib-setupext-tk.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove patch.
Signed-off-by: Marius Bakke <address@hidden>
---
gnu/local.mk | 1 -
gnu/packages/patches/matplotlib-setupext-tk.patch | 34 ------
gnu/packages/python.scm | 120 +++++++++++++---------
3 files changed, 69 insertions(+), 86 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5fd7c77..5dec691 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -746,7 +746,6 @@ dist_patch_DATA =
\
%D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \
- %D%/packages/patches/matplotlib-setupext-tk.patch \
%D%/packages/patches/maxima-defsystem-mkdir.patch \
%D%/packages/patches/mcron-install.patch \
%D%/packages/patches/mcrypt-CVE-2012-4409.patch \
diff --git a/gnu/packages/patches/matplotlib-setupext-tk.patch
b/gnu/packages/patches/matplotlib-setupext-tk.patch
deleted file mode 100644
index 37c3d68..0000000
--- a/gnu/packages/patches/matplotlib-setupext-tk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Use 'pkg-config' instead of heuristics to find 'tk' flags.
-
---- matplotlib-1.4.3/setupext.py.orig 2015-12-01 14:21:19.554417453 +0100
-+++ matplotlib-1.4.3/setupext.py 2015-12-02 10:39:47.282363530 +0100
-@@ -1457,7 +1457,7 @@
- p = subprocess.Popen(
- '. %s ; eval echo ${%s}' % (file, varname),
- shell=True,
-- executable="/bin/sh",
-+ executable="sh",
- stdout=subprocess.PIPE)
- result = p.communicate()[0]
- return result.decode('ascii')
-@@ -1601,8 +1601,19 @@
- # of distros.
-
- # Query Tcl/Tk system for library paths and version string
-+ def getoutput(s):
-+ ret = os.popen(s).read().strip()
-+ return ret
- try:
-- tcl_lib_dir, tk_lib_dir, tk_ver = self.query_tcltk()
-+ pkg_config_libs = getoutput('pkg-config --libs-only-L
tk').split()
-+ # drop '-L' part of strings
-+ pkg_config_libs = [s[2:] for s in pkg_config_libs]
-+ pkg_config_ver = getoutput('pkg-config --modversion tk')
-+ tk_ver = re.match(r"(\d+.\d+)[\d.]*", pkg_config_ver).group(1)
-+ tcl_lib_dir = next(s for s in pkg_config_libs
-+ if re.match(r".*-tcl-.*", s)) + '/tcl' +
tk_ver
-+ tk_lib_dir = next(s for s in pkg_config_libs
-+ if re.match(r".*-tk-.*", s)) + '/tk' +
tk_ver
- except:
- tk_ver = ''
- result = self.hardcoded_tcl_config()
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 56c16fd..7315df7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -89,6 +89,7 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages sdl)
#:use-module (gnu packages shells)
@@ -3869,21 +3870,20 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*,
CIECAM02, CAM02-UCS, etc.
(define-public python-matplotlib
(package
(name "python-matplotlib")
- (version "1.4.3")
+ (version "2.0.0")
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://sourceforge/matplotlib/matplotlib"
- "/matplotlib-" version
- "/matplotlib-" version ".tar.gz"))
+ (uri (string-append
+ "https://github.com/matplotlib/matplotlib/archive/v"; version
".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av"))
- (patches (search-patches "matplotlib-setupext-tk.patch"))))
+ "0w3k5m5qb3wsd7yhvmg042xddvligklvcq2visk2c5wnph3hhsln"))))
(build-system python-build-system)
- (outputs '("out" "doc"))
(propagated-inputs ; the following packages are all needed at run time
- `(("python-pyparsing" ,python-pyparsing)
+ `(("python-cycler" ,python-cycler)
+ ("python-pyparsing" ,python-pyparsing)
("python-pygobject" ,python-pygobject)
("gobject-introspection" ,gobject-introspection)
("python-tkinter" ,python "tk")
@@ -3915,17 +3915,13 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*,
CIECAM02, CAM02-UCS, etc.
("glib" ,glib)
;; FIXME: Add backends when available.
;("python-wxpython" ,python-wxpython)
- ;("python-pyqt" ,python-pyqt)
+ ("python-pyqt" ,python-pyqt)
("tcl" ,tcl)
("tk" ,tk)))
(native-inputs
`(("pkg-config" ,pkg-config)
- ("python-sphinx" ,python-sphinx-1.2.3)
- ("python-numpydoc" ,python-numpydoc)
("python-nose" ,python-nose)
- ("python-mock" ,python-mock)
- ("texlive" ,texlive)
- ("texinfo" ,texinfo)))
+ ("python-mock" ,python-mock)))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -3944,26 +3940,68 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*,
CIECAM02, CAM02-UCS, etc.
basedirlist = ~a,~a~%
[rc_options]~%
backend = TkAgg~%"
- (assoc-ref inputs "tcl")
- (assoc-ref inputs "tk"))))
- #t)))
- (add-after 'install 'install-doc
+ (assoc-ref inputs "tcl")
+ (assoc-ref inputs "tk")))))
+ #t)))))
+ (home-page "http://matplotlib.org";)
+ (synopsis "2D plotting library for Python")
+ (description
+ "Matplotlib is a Python 2D plotting library which produces publication
+quality figures in a variety of hardcopy formats and interactive environments
+across platforms. Matplotlib can be used in Python scripts, the python and
+ipython shell, web application servers, and six graphical user interface
+toolkits.")
+ (license license:psfl)
+ (properties `((python2-variant . ,(delay python2-matplotlib))))))
+
+(define-public python2-matplotlib
+ (let ((matplotlib (package-with-python2
+ (strip-python2-variant python-matplotlib))))
+ (package (inherit matplotlib)
+ ;; Make sure to use special packages for Python 2 instead
+ ;; of those automatically rewritten by package-with-python2.
+ (propagated-inputs
+ `(("python2-pycairo" ,python2-pycairo)
+ ("python2-functools32" ,python2-functools32)
+ ("python2-pygobject-2" ,python2-pygobject-2)
+ ("python2-subprocess32" ,python2-subprocess32)
+ ("python2-tkinter" ,python-2 "tk")
+ ,@(fold alist-delete (package-propagated-inputs matplotlib)
+ '("python-pycairo" "python-pygobject" "python-tkinter")))))))
+
+(define-public python-matplotlib-documentation
+ (package
+ (name "python-matplotlib-documentation")
+ (version (package-version python-matplotlib))
+ (source (package-source python-matplotlib))
+ (build-system python-build-system)
+ (native-inputs
+ `(("python-matplotlib" ,python-matplotlib)
+ ("python-colorspacious" ,python-colorspacious)
+ ("python-sphinx" ,python-sphinx)
+ ("python-numpydoc" ,python-numpydoc)
+ ("python-ipython" ,python-ipython)
+ ("texlive" ,texlive)
+ ("texinfo" ,texinfo)
+ ,@(package-native-inputs python-matplotlib)))
+ (arguments
+ `(#:tests? #f ; we're only generating documentation
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'build)
+ (replace 'install
(lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((data (string-append (assoc-ref outputs "doc") "/share"))
+ (let* ((data (string-append (assoc-ref outputs "out") "/share"))
(doc (string-append data "/doc/" ,name "-" ,version))
(info (string-append data "/info"))
(html (string-append doc "/html")))
;; Make installed package available for building the
;; documentation
- (add-installed-pythonpath inputs outputs)
(with-directory-excursion "doc"
;; Produce pdf in 'A4' format.
(substitute* (find-files "." "conf\\.py")
(("latex_paper_size = 'letter'")
"latex_paper_size = 'a4'"))
- (substitute* "users/intro.rst"
- ;; Fix reST markup error (see
<https://github.com/sphinx-doc/sphinx/issues/3044>)
- (("[[][*][]]") "[#]"))
(mkdir-p html)
(mkdir-p info)
;; The doc recommends to run the 'html' target twice.
@@ -3985,35 +4023,15 @@ backend = TkAgg~%"
(copy-file "build/texinfo/matplotlib.info"
(string-append info "/matplotlib.info"))
(copy-file "build/latex/Matplotlib.pdf"
- (string-append doc "/Matplotlib.pdf")))
- #t))))))
- (home-page "http://matplotlib.org";)
- (synopsis "2D plotting library for Python")
- (description
- "Matplotlib is a Python 2D plotting library which produces publication
-quality figures in a variety of hardcopy formats and interactive environments
-across platforms. Matplotlib can be used in Python scripts, the python and
-ipython shell, web application servers, and six graphical user interface
-toolkits.")
- (license license:psfl)
- (properties `((python2-variant . ,(delay python2-matplotlib))))))
+ (string-append doc "/Matplotlib.pdf"))))
+ #t)))))
+ (home-page (package-home-page python-matplotlib))
+ (synopsis "Documentation for the python-matplotlib package")
+ (description (package-description python-matplotlib))
+ (license (package-license python-matplotlib))))
-(define-public python2-matplotlib
- (let ((matplotlib (package-with-python2
- (strip-python2-variant python-matplotlib))))
- (package (inherit matplotlib)
- ;; Make sure to use special packages for Python 2 instead
- ;; of those automatically rewritten by package-with-python2.
- (native-inputs
- `(("python2-sphinx" ,python2-sphinx-1.2.3)
- ,@(fold alist-delete (package-native-inputs matplotlib)
- '("python-sphinx"))))
- (propagated-inputs
- `(("python2-pycairo" ,python2-pycairo)
- ("python2-pygobject-2" ,python2-pygobject-2)
- ("python2-tkinter" ,python-2 "tk")
- ,@(fold alist-delete (package-propagated-inputs matplotlib)
- '("python-pycairo" "python-pygobject" "python-tkinter")))))))
+(define-public python2-matplotlib-documentation
+ (package-with-python2 python-matplotlib-documentation))
(define-public python2-pysnptools
(package