From 007176e7103fc25bca295c7b09578a37f5d635c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 15:24:54 +0200 Subject: gnu: python-pyparsing: Use 'modify-phases' syntax. * gnu/packages/python.scm (python-pyparsing)[arguments]<#:phases>: Use 'modify-phases'. --- gnu/packages/python.scm | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index e7a40dfcdd..a8e3186bec 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3955,26 +3955,24 @@ library, libgit2 implements Git plumbing.") (outputs '("out" "doc")) (arguments `(#:tests? #f ; no test target - #:modules ((guix build python-build-system) - (guix build utils)) #:phases - (alist-cons-after - 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version)) - (html-doc (string-append doc "/html")) - (examples (string-append doc "/examples"))) - (mkdir-p html-doc) - (mkdir-p examples) - (for-each - (lambda (dir tgt) - (map (lambda (file) - (install-file file tgt)) - (find-files dir ".*"))) - (list "docs" "htmldoc" "examples") - (list doc html-doc examples)))) - %standard-phases))) + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (string-append (assoc-ref outputs "doc") + "/share/doc/" ,name "-" ,version)) + (html-doc (string-append doc "/html")) + (examples (string-append doc "/examples"))) + (mkdir-p html-doc) + (mkdir-p examples) + (for-each + (lambda (dir tgt) + (map (lambda (file) + (install-file file tgt)) + (find-files dir ".*"))) + (list "docs" "htmldoc" "examples") + (list doc html-doc examples)) + #t)))))) (home-page "http://pyparsing.wikispaces.com") (synopsis "Python parsing class library") (description -- cgit v1.2.3 From 9e5ee6b60cb7d2a0bc0281634e3e434c885877a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 15:30:34 +0200 Subject: gnu: python-pyparsing: Update to 2.2.0. * gnu/packages/python.scm (python-pyparsing, python2-pyparsing): Update to 2.2.0. --- gnu/packages/python.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a8e3186bec..6d9963dec4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3941,7 +3941,7 @@ library, libgit2 implements Git plumbing.") (define-public python-pyparsing (package (name "python-pyparsing") - (version "2.0.3") + (version "2.2.0") (source (origin (method url-fetch) @@ -3950,7 +3950,7 @@ library, libgit2 implements Git plumbing.") "/pyparsing-" version ".tar.gz")) (sha256 (base32 - "0kw4py7gn45j93q8r7bzajfrjdc3xlsn2yzln41lf9zmrghjkrq6")))) + "016b9gh606aa44sq92jslm89bg874ia0yyiyb643fa6dgbsbqch8")))) (build-system python-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 71d20587a5c8e1d8c5025322e27f9312586e9b99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 15:50:42 +0200 Subject: gnu: python-matplotlib: Update to 2.0.2. * gnu/packages/python.scm (python-matplotlib): Update to 2.0.2. [source]: Use 'pypi-uri'. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6d9963dec4..698fb605fd 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4115,16 +4115,14 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (define-public python-matplotlib (package (name "python-matplotlib") - (version "2.0.0") + (version "2.0.2") (source (origin (method url-fetch) - (uri (string-append - "https://github.com/matplotlib/matplotlib/archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "0w3k5m5qb3wsd7yhvmg042xddvligklvcq2visk2c5wnph3hhsln")))) + "1w8z2a1l7s72p1byfz7g03wqhygqxi8w82619dqb3a1lm97w9yqg")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) -- cgit v1.2.3 From 09efef338430d1f3bc2473f05f0c30ae3070e60e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 22 Jul 2017 18:58:29 +0200 Subject: gnu: python-scipy: Update to 0.19.1. * gnu/packages/python.scm (python-scipy): Update to 0.19.1. [source]: Use 'pypi-uri'. --- gnu/packages/python.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 698fb605fd..ae7ab6eb57 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -4358,16 +4358,14 @@ functions.") (define-public python-scipy (package (name "python-scipy") - (version "0.18.1") + (version "0.19.1") (source (origin (method url-fetch) - (uri (string-append "https://github.com/scipy/scipy/archive/v" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (uri (pypi-uri "scipy" version)) (sha256 (base32 - "17slsrfawjp7if6qrlx03zhgp05350ginxx8ddpw9zqx43x905sn")))) + "1rl411bvla6q7qfdb47fpdnyjhfgzl6smpha33n9ar1klykjr6m1")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) -- cgit v1.2.3