From fc7c91a53a9c5c4ce0fd6d62dd8a57f4d2e6a590 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 3 May 2018 16:37:42 +0200 Subject: gnu: python-mako: Update to 1.0.7. * gnu/packages/python.scm (python-mako): Update to 1.0.7. --- 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 a359eebd12..97b8ace869 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7652,14 +7652,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "03dyxgjknp4ffsv7vwfd28l5bbpzi0ylp20543wpg3iahyyrwma8")))) + "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) -- cgit 1.4.1 From ffacb7954b8d4e52a2714bbc2437032a000041a5 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Fri, 4 May 2018 08:50:08 +0200 Subject: Revert "gnu: python-mako: Update to 1.0.7." This causes a mass rebuild due to python2-mako rebuilding Mesa. Pushed on staging instead. This reverts commit fc7c91a53a9c5c4ce0fd6d62dd8a57f4d2e6a590. --- 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 97b8ace869..a359eebd12 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -7652,14 +7652,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.7") + (version "1.0.6") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) + "03dyxgjknp4ffsv7vwfd28l5bbpzi0ylp20543wpg3iahyyrwma8")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) -- cgit 1.4.1 From d6ed49ba3fbcb6ae522acb3757f93ca8da01648f Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 4 May 2018 22:28:33 +0100 Subject: gnu: python-qrcode: Use a newer version of setuptools. The upgrade from 5.3 to 6.0 switches to rely on the on the setup.cfg, and with the version of setuptools incldued with Python, this isn't supported, so no actual code is installed, and the output is mostly empty. * gnu/packages/python.scm (python-qrcode)[inputs]: Add python-setuptools. --- gnu/packages/python.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a359eebd12..f63460b8ff 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -10414,6 +10414,10 @@ a file-like object from which an arbitrarly-sized key can be read.") `(("python-lxml" ,python-lxml) ; for SVG output ("python-pillow" ,python-pillow) ; for PNG output ("python-six" ,python-six))) + (inputs + `(;; The setup.cfg file needs to be used, and support for this requires + ;; at least version 30.3.0 of setuptools + ("python-setuptools" ,python-setuptools))) (home-page "https://github.com/lincolnloop/python-qrcode") (synopsis "QR Code image generator") (description "This package provides a pure Python QR Code generator -- cgit 1.4.1 From 02dc4b8095750889f2e9c854d94fa2485bed2537 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 May 2018 20:03:09 +0200 Subject: gnu: Add python-sphinx-gallery. * gnu/packages/python.scm (python-sphinx-gallery, python2-sphinx-gallery): New public variables. --- gnu/packages/python.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index f63460b8ff..7a4eee32ca 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2501,6 +2501,36 @@ sources.") (propagated-inputs `(("python2-pytz" ,python2-pytz) ,@(package-propagated-inputs base)))))) +(define-public python-sphinx-gallery + (package + (name "python-sphinx-gallery") + (version "0.1.13") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/sphinx-gallery/sphinx-gallery" + "/archive/v" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03fs99mcb1r7qp0xixqv07vcz98sk21yq19ffdysi0infdcpzfkd")))) + (build-system python-build-system) + (arguments + ;; FIXME: Tests attempt to download , + ;; , and + ;; . + `(#:tests? #f)) + (native-inputs + `(("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://sphinx-gallery.github.io/") + (synopsis "Generate an examples gallery automatically") + (description + "@code{sphinx_gallery} is a Sphinx extension that builds an HTML version +from any set of Python scripts and puts it into an examples gallery.") + (license license:bsd-3))) + +(define-public python2-sphinx-gallery + (package-with-python2 python-sphinx-gallery)) + (define-public python-sphinx-rtd-theme (package (name "python-sphinx-rtd-theme") -- cgit 1.4.1 From 4a3ac362bbace262623e80cbfdfa3449736789cf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 May 2018 17:37:47 +0200 Subject: gnu: python-matplotlib: Update to 2.2.2. * gnu/packages/python.scm (python-matplotlib): Update to 2.2.2. [propagated-inputs]: Add PYTHON-KIWISOLVER. (python2-matplotlib)[propagated-inputs]: Add PYTHON2-BACKPORTS-FUNCTOOLS-LRU-CACHE. (python-matplotlib-documentation)[native-inputs]: Change PYTHON-SPHINX to PYTHON-SPHINX-1.6. Add PYTHON-SPHINX-GALLERY. --- gnu/packages/python.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 7a4eee32ca..0eb6d73173 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3372,17 +3372,18 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (define-public python-matplotlib (package (name "python-matplotlib") - (version "2.0.2") + (version "2.2.2") (source (origin (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 (base32 - "1w8z2a1l7s72p1byfz7g03wqhygqxi8w82619dqb3a1lm97w9yqg")))) + "1s6dv225w3k4fv52h8lfjc7qq5y56i9755ayx0mz48ddi99fzisd")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) + ("python-kiwisolver" ,python-kiwisolver) ("python-pyparsing" ,python-pyparsing) ("python-pygobject" ,python-pygobject) ("gobject-introspection" ,gobject-introspection) @@ -3462,6 +3463,8 @@ toolkits.") ;; of those automatically rewritten by package-with-python2. (propagated-inputs `(("python2-pycairo" ,python2-pycairo) + ("python2-backports-functools-lru-cache" + ,python2-backports-functools-lru-cache) ("python2-functools32" ,python2-functools32) ("python2-pygobject-2" ,python2-pygobject-2) ("python2-subprocess32" ,python2-subprocess32) @@ -3478,7 +3481,8 @@ toolkits.") (native-inputs `(("python-matplotlib" ,python-matplotlib) ("python-colorspacious" ,python-colorspacious) - ("python-sphinx" ,python-sphinx) + ("python-sphinx" ,python-sphinx-1.6) + ("python-sphinx-gallery" ,python-sphinx-gallery) ("python-numpydoc" ,python-numpydoc) ("python-ipython" ,python-ipython) ("python-mock" ,python-mock) @@ -3501,7 +3505,7 @@ toolkits.") (("latex_elements\\['pointsize'\\] = '11pt'" match) ;; insert at a point where latex_elements{} is defined: (string-append match "\nlatex_elements['papersize'] = 'a4paper'"))) - (zero? (system* "python" "make.py" "html" "latex" "texinfo")))) + (invoke "make" "SPHINXBUILD=sphinx-build" "html" "latex" "texinfo"))) (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((data (string-append (assoc-ref outputs "out") "/share")) -- cgit 1.4.1 From 982e886584ea804822ad6bbdf7050dcef65d03fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 May 2018 17:38:07 +0200 Subject: gnu: python-scipy: Update to 1.0.1. * gnu/packages/python.scm (python-scipy): Update to 1.0.1. --- 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 0eb6d73173..7bf36cfa71 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3639,14 +3639,14 @@ functions.") (define-public python-scipy (package (name "python-scipy") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (pypi-uri "scipy" version)) (sha256 (base32 - "043djb3vyk6qripmyw30jhl0g8qza0fmar6wck10iv79l08izsl7")))) + "1fj0r7bg0cfk5clvl57ga06y9bfh05iwlv1dqqs1r6pd89wccfc7")))) (build-system python-build-system) (propagated-inputs `(("python-numpy" ,python-numpy) -- cgit 1.4.1 From b05742559667001e2bc8adb8ce4480544a1fbb25 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 2 May 2018 17:37:20 +0200 Subject: gnu: python-numpy: Update to 1.14.3. * gnu/packages/python.scm (python-numpy): Update to 1.14.3. --- 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 7bf36cfa71..e2e74d773f 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2812,7 +2812,7 @@ between language specification and implementation aspects.") (define-public python-numpy (package (name "python-numpy") - (version "1.14.0") + (version "1.14.3") (source (origin (method url-fetch) @@ -2821,7 +2821,7 @@ between language specification and implementation aspects.") version "/numpy-" version ".tar.gz")) (sha256 (base32 - "1kh7y2ay21s9mcc11mq59g2f1yc75v152z2k2vlh0xmh9c9rjpf4")))) + "1yim2bxlycn4dhxmfxid6slplpmcb4ynhp411b37ahmsm2lwgkyg")))) (build-system python-build-system) (inputs `(("openblas" ,openblas) -- cgit 1.4.1