From 11bab809e1fa4760bc0caeb5e8aab2991738afbd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:50:45 +0200 Subject: gnu: python-cython: Update to 0.29.7. * gnu/packages/python-xyz.scm (python-cython): Update to 0.29.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 35147ebfa7..f6fe1fcee3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3263,14 +3263,14 @@ and is very extensible.") (define-public python-cython (package (name "python-cython") - (version "0.29.6") + (version "0.29.7") (source (origin (method url-fetch) (uri (pypi-uri "Cython" version)) (sha256 (base32 - "1bp7cn0pp5qy63k9hbp4ka34fm01kvysh478phpkhr68npqk6pbc")))) + "1s61hq2ikawxp6qvmkbfvvaxy9rqj67cddzwgcfc3dwi44b83l2m")))) (build-system python-build-system) ;; we need the full python package and not just the python-wrapper ;; because we need libpython3.3m.so -- cgit 1.4.1 From c187c9d786e10d68f5730c2728cee266bdbb406f Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:17 +1000 Subject: gnu: python-regex, python2-regex: Update to 2019.04.14. * gnu/packages/python.scm (python-regex, python2-regex): Update to 2019.04.14. Signed-off-by: Danny Milosavljevic --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 35147ebfa7..31f3ea3688 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13061,13 +13061,15 @@ window memory map manager.") (define-public python-regex (package (name "python-regex") - (version "2017.06.07") + (version "2019.04.14") (source (origin (method url-fetch) (uri (pypi-uri "regex" version)) (sha256 (base32 - "06r6b7yigikbj3a72whl85r2b64pj1r0ypmw9yalmkm0wnxq8mz4")))) + "1a6hhfs6l6snr1z654ay6wzbmwdkmv282fzfkd5hk2d1n73y8v6m")))) + ;; TODO: Fix and enable regex_test.py tests that complain about the + ;; test.support module not existing. (build-system python-build-system) (home-page "https://bitbucket.org/mrabarnett/mrab-regex") (synopsis "Alternative regular expression module") -- cgit 1.4.1 From ad74978a951b81081495561419ecbff5bb412397 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:19 +1000 Subject: gnu: Add python-soupsieve, python2-soupsieve. * gnu/packages/python-xyz.scm (python-soupsieve): New variable. (python2-soupsieve): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 31f3ea3688..42e8a60b3a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5559,6 +5559,39 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (strip-python2-variant python-beautifulsoup4))) (arguments `(#:python ,python-2)))) +(define-public python-soupsieve + (package + (name "python-soupsieve") + (version "1.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "soupsieve" version)) + (sha256 + (base32 + "1jnzkiwmjl6yvqckc9mf689g87b6yz07sv868hap2aa5arggy3mj")))) + (build-system python-build-system) + (arguments `(#:tests? #f)) + ;;XXX: 2 tests fail currently despite claming they were to be + ;;skipped. Also, beautifulsoup4 may depend on this in the future, so we + ;;don't want to create a circular dependency. + (home-page "https://github.com/facelessuser/soupsieve") + (synopsis "CSS selector library") + (description + "Soup Sieve is a CSS selector library designed to be used with Beautiful +Soup 4. It aims to provide selecting, matching, and filtering using modern +CSS selectors. Soup Sieve currently provides selectors from the CSS level 1 +specifications up through the latest CSS level 4 drafts and beyond (though +some are not yet implemented).") + (license license:expat))) + +(define-public python2-soupsieve + (let ((base (package-with-python2 python-soupsieve))) + (package + (inherit base) + (propagated-inputs + `(("python2-backports-functools-lru-cache" ,python2-backports-functools-lru-cache)))))) + (define-public python-netifaces (package (name "python-netifaces") -- cgit 1.4.1 From dcfa0acd7be3d6beaa87aae0ebe92104d7626a57 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:32 +1000 Subject: Correct email and license info for Brendan Tildesley. * gnu/packages/audio.scm: Correct email and license info. * gnu/packages/ebook.scm: Correct email and license info. * gnu/packages/fonts.scm: Correct email and license info. * gnu/packages/freedesktop.scm: Correct email and license info. * gnu/packages/gnome.scm: Correct email and license info. * gnu/packages/linux.scm: Correct email and license info. * gnu/packages/lxde.scm: Correct email and license info. * gnu/packages/python-web.scm: Correct email and license info. * gnu/packages/python-xyz.scm: Correct email and license info. * gnu/packages/python.scm: Correct email and license info. * gnu/packages/video.scm: Correct email and license info. * gnu/packages/web.scm: Correct email and license info. Signed-off-by: Danny Milosavljevic --- gnu/packages/audio.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gnome.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/lxde.scm | 2 +- gnu/packages/python-web.scm | 1 + gnu/packages/python-xyz.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/web.scm | 1 + 12 files changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2ec873dab5..c897e30458 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018 Eric Bavier -;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2019 Rutger Helling diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 454e65a4aa..cf424f285d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017, 2019 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 6405ce42bb..dc73c49018 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Clément Lassieur -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2017, 2018, 2019 Arun Isaac ;;; Copyright © 2017 Mohammed Sadiq ;;; Copyright © 2018 Charlie Ritter diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index fa8bb3cad1..4c47e0c3cb 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8e3b7a406a..692a215e0d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018 nee ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017 Mohammed Sadiq -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0dfa2f173a..4ecb6bd490 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 8c0ac3a5f4..cc5e090f58 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 ng0 ;;; Copyright © 2017 Mathieu Othacehe -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 ison ;;; Copyright © 2018, 2019 Ludovic Courtès diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 839d444f7c..757f1058ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian +;;; Copyright © 2019 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 42e8a60b3a..b0d2b105ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2017, 2018 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017, 2019 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones ;;; Copyright © 2018 Vijayalakshmi Vedantham diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 57ced499cb..11f3aacf00 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2017, 2018 Kei Kebreau ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2017 Muriithi Frederick Muriuki -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2018 Ethan R. Jones ;;; Copyright © 2018 Vijayalakshmi Vedantham diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 86c5870f8f..9d9804fa91 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018, 2019 Leo Famulari -;;; Copyright © 2018 Brendan Tildesley +;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018 Mark Meyer diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7242ede3be..52cc91a168 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2018 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; -- cgit 1.4.1 From 492e3a7a76c4d6e764e9cf600c6d5ab78114c26f Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 27 Apr 2019 21:43:04 +1000 Subject: gnu: python-pyyaml: Fix license field to refer to license:wtfpl2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pyyaml): Fix license field to refer to license:wtfpl2. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b0d2b105ca..02cc18d203 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10200,7 +10200,7 @@ addresses, and phone numbers.") (description "pyaml is a PyYAML based python module to produce pretty and readable YAML-serialized data.") - (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/")))) + (license license:wtfpl2))) (define-public python2-pyaml (package-with-python2 python-pyaml)) -- cgit 1.4.1 From d5d540303381836106621e545ee7c1b794f5fc74 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 01:39:33 +0200 Subject: gnu: python-future: Update to 0.17.1. * gnu/packages/python-xyz.scm (python-future): Update to 0.17.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 02cc18d203..5ed1ebdd3c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9332,14 +9332,14 @@ development version of CPython that are not available in older releases.") (define-public python-future (package (name "python-future") - (version "0.16.0") + (version "0.17.1") (source (origin (method url-fetch) (uri (pypi-uri "future" version)) (sha256 (base32 - "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773")))) + "1f2rlqn9rh7adgir52dlbqz69gsab44x0mlm8gf1cs7xvhv54137")))) (build-system python-build-system) ;; Many tests connect to the network or are otherwise flawed. ;; https://github.com/PythonCharmers/python-future/issues/210 -- cgit 1.4.1 From 4a5c79346a0de54f32f805ff4f11e72d3c2b489d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 19:47:45 +0200 Subject: gnu: python-jinja2: Update to 2.10.1. * gnu/packages/python-xyz.scm (python-jinja2): Update to 2.10.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f6fe1fcee3..0a1b41066c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2318,14 +2318,14 @@ for Python.") (define-public python-jinja2 (package (name "python-jinja2") - (version "2.10") + (version "2.10.1") (source (origin (method url-fetch) (uri (pypi-uri "Jinja2" version)) (sha256 (base32 - "190l36hfw3wb2n3n68yacjabxyb1pnxwn7vjx96cmjj002xy2jzq")))) + "04shqrs56aj04ipyqykj512rw2l0zfammvj9krawzxz7xc14yp06")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) -- cgit 1.4.1 From 4cd4173d5bc92a55542e1693755f397e17887a48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 19:51:20 +0200 Subject: gnu: python-pygments: Update to 2.4.0. * gnu/packages/python-xyz.scm (python-pygments): Update to 2.4.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0a1b41066c..3ec45ff6ea 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2482,14 +2482,14 @@ reStructuredText.") (define-public python-pygments (package (name "python-pygments") - (version "2.2.0") + (version "2.4.0") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv")))) + "1xb5n3hvhk63kxypc03k7kfry20pny6gygi4bsl9kw1rnzzsdjri")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. -- cgit 1.4.1 From 9dc6ff5a85ebd6f4968f33888646ac9ce707d8ce Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 19:51:45 +0200 Subject: gnu: python-packaging: Update to 19.0. * gnu/packages/python-xyz.scm (python-packaging): Update to 19.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3ec45ff6ea..4e0676fc2d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12436,14 +12436,14 @@ several utilities, as well as an API for building localization tools.") (define-public python-packaging (package (name "python-packaging") - (version "18.0") + (version "19.0") (source (origin (method url-fetch) (uri (pypi-uri "packaging" version)) (sha256 (base32 - "01wq9c53ix5rz6qg2c98gy8n4ff768rmanifm8m5jpjiaizj51h8")))) + "1brjhygq9dz6x1kdljivkjfldi3qf5rbkqgck1bpgv9qpv8ab60c")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 79bfa42287f98e72b99e7165280e2750fad46cd3 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Wed, 15 May 2019 15:12:13 +0200 Subject: gnu: Add python-pylzma. * gnu/packages/python-xyz.scm (python-pylzma): New variable. (python2-pylzma): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5ed1ebdd3c..024fc96f35 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15665,3 +15665,24 @@ processes may share the same data.") (description "A Sphinx extension to convert SVG images to PDF in case the builder does not support SVG images natively (e.g. LaTeX).") (license license:bsd-3))) + +(define-public python-pylzma + (package + (name "python-pylzma") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pylzma" version)) + (sha256 + (base32 + "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q")))) + (build-system python-build-system) + (home-page "http://www.joachim-bauch.de/projects/pylzma/") + (synopsis "Python bindings for the LZMA library by Igor Pavlov.") + (description "This package provides Python bindings for the LZMA library +by Igor Pavlov.") + (license license:lgpl2.1+))) + +(define-public python2-pylzma + (package-with-python2 python-pylzma)) -- cgit 1.4.1 From b8e5de56086ad0d76573849ca996122549b56b38 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 15 May 2019 15:13:58 -0400 Subject: gnu: python-jedi: Update to 0.13.3. * gnu/packages/python-xyz.scm (python-jedi): Update to 0.13.3. (python2-jedi): Enable tests. --- gnu/packages/python-xyz.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 024fc96f35..5322b70759 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10290,17 +10290,17 @@ characters, mouse support, and auto suggestions.") (define-public python-jedi (package (name "python-jedi") - (version "0.13.2") + (version "0.13.3") (source (origin (method url-fetch) (uri (pypi-uri "jedi" version)) (sha256 (base32 - "1za944msp0f8x36qa8l309jhv0kzlsdh7r9nj3z12y8npnsh45sp")))) + "0nsrjlb57njqppxmi8wjsb1dkad7qa7svx67jbkhixq66lz61c1b")))) (build-system python-build-system) (arguments - `( ;; Many tests are failing with Python 3.7.x as of version 0.13.2 (see: + `( ;; Many tests are failing with Python 3.7.x as of version 0.13.3 (see: ;; https://github.com/davidhalter/jedi/issues/1263) #:tests? #f #:phases @@ -10326,7 +10326,11 @@ well.") (license license:expat))) (define-public python2-jedi - (package-with-python2 python-jedi)) + (let ((base (package-with-python2 (strip-python2-variant python-jedi)))) + (package + (inherit base) + (arguments (substitute-keyword-arguments (package-arguments base) + ((#:tests? _) #t)))))) (define-public ptpython (package -- cgit 1.4.1 From 8c141421fa43e885b56bbb88d26ccd8ff5348b00 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Fri, 17 May 2019 13:42:12 -0400 Subject: gnu: Add mallard-ducktype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm: (mallard-ducktype) new variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5322b70759..1c337e0685 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Sam +;;; Copyright © 2019 Jack Hill ;;; ;;; This file is part of GNU Guix. ;;; @@ -3224,6 +3225,32 @@ Markdown input files, and more. Pelican uses Jinja2 for templating and is very extensible.") (license license:agpl3+))) +(define-public mallard-ducktype + (package + (name "mallard-ducktype") + (version "1.0.1") + (source + (origin + (method git-fetch) + ;; git-reference because a proper source tarball is not available + ;; https://lists.gnu.org/archive/html/guix-devel/2019-05/msg00209.html + (uri (git-reference + (url "https://github.com/projectmallard/mallard-ducktype.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0crland0kmpsyjfmnflcw7gaqy5b87b6ah17cmr9d5z1kyazf54n")))) + (build-system python-build-system) + (home-page "http://projectmallard.org") + (synopsis "Convert Ducktype to Mallard documentation markup") + (description + "Ducktype is a lightweight syntax that can represent all the semantics +of the Mallard XML documentation system. Ducktype files can be converted to +Mallard using the @command{ducktype} tool. The yelp-tools package +provides additional functionality on the produced Mallard documents.") + (license license:expat))) + (define-public python-scikit-image (package (name "python-scikit-image") -- cgit 1.4.1 From 1df5407cad6f726787d2c271f9fd3a2aaa8f3512 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 22 May 2019 15:26:00 -0700 Subject: gnu: python-jsonrpc-server: Fix typo "This package". * gnu/packages/python-xyz (python-jsonrpc-server)[description]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1c337e0685..c1920b59f3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3063,7 +3063,7 @@ Language (TOML) configuration files.") "https://github.com/palantir/python-jsonrpc-server") (synopsis "JSON RPC 2.0 server library") (description - "This packages provides a JSON RPC 2.0 server library for Python.") + "This package provides a JSON RPC 2.0 server library for Python.") (license license:expat))) (define-public python-pydocstyle -- cgit 1.4.1 From e36de31b1d5eb4837aeee08e50f1f1e8d0ba2b32 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 22 May 2019 15:27:13 -0700 Subject: gnu: python-bigfloat: Fix typo "This package". * gnu/packages/python-xyz (python-bigfloat)[description]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c1920b59f3..b6fb9b504f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5874,7 +5874,7 @@ more advanced mathematics.") (home-page "https://github.com/mdickinson/bigfloat") (synopsis "Arbitrary precision floating-point arithmetic for Python") (description - "This packages provides a Python interface to the MPFR library for + "This package provides a Python interface to the MPFR library for multiprecision arithmetic.") (license license:lgpl3+))) -- cgit 1.4.1 From a090928635698edd9d1b0d0a996f7a662539bfbd Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 22 May 2019 15:28:32 -0700 Subject: gnu: python-xlrd: Fix typo "This package". * gnu/packages/python-xyz (python-xlrd)[description]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b6fb9b504f..cbc2f089cb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6831,7 +6831,7 @@ and MAC network addresses.") (native-inputs `(("python-nose" ,python-nose))) (home-page "http://www.python-excel.org/") (synopsis "Library for extracting data from Excel files") - (description "This packages provides a library to extract data from + (description "This package provides a library to extract data from spreadsheets using Microsoft Excel proprietary file formats @samp{.xls} and @samp{.xlsx} (versions 2.0 onwards). It has support for Excel dates and is Unicode-aware. It is not intended as an end-user tool.") -- cgit 1.4.1 From 4ca7207be2aca4f2d446388b3bdef32298c6a928 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 22 May 2019 16:45:09 -0700 Subject: gnu: python-docopt: Fix typo "programmatically". * gnu/packages/python-xyz (python-docopt)[description]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cbc2f089cb..e3391dcd0e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7745,7 +7745,7 @@ automatically detect a wide range of file encodings.") (synopsis "Command-line interface description language for Python") (description "This library allows the user to define a command-line interface from a program's help message rather than specifying it -programatically with command-line parsers like @code{getopt} and +programmatically with command-line parsers like @code{getopt} and @code{argparse}.") (license license:expat))) -- cgit 1.4.1 From 50fceab07ee7f01e82bb4229cad6de8f66d988db Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 22 May 2019 17:33:10 -0700 Subject: gnu: python-honcho: Fix typo "several". * gnu/packages/python-xyz (python-honcho)[description]: Fix typo. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3391dcd0e..e5f9f39694 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4862,7 +4862,7 @@ cluster without needing to write any wrapper code yourself.") (synopsis "Manage Procfile-based applications") (description "A Procfile is a file which describes how to run an application -consisting of serveral processes. honcho starts all listed processes. +consisting of several processes. honcho starts all listed processes. The output of all running processes is collected by honcho and displayed.") (license license:expat))) -- cgit 1.4.1 From 9d0c291e3e6d226cdfd4cebee0a389ad24fa748f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 12 May 2019 22:56:54 +0200 Subject: gnu: Move Sphinx and friends to (gnu packages sphinx). * gnu/packages/python-xyz.scm (python-sphinxcontrib-websupport, python2-sphinxcontrib-websupport, python-sphinx, python2-sphinx, python-sphinx-gallery, python2-sphinx-gallery, python-sphinx-rtd-theme, python2-sphinx-rtd-theme, python-guzzle-sphinx-theme, python2-guzzle-sphinx-theme, python-sphinxcontrib-newsfeed, python-sphinxcontrib-programoutput, python2-sphinxcontrib-programoutput, python-sphinx-repoze-interface, python2-sphinx-repoze-interface, python-sphinx-cloud-sptheme, python2-sphinx-cloud-sptheme, python-sphinx-alabaster-theme, python2-sphinx-alabaster-theme, python-sphinx-me, python-sphinxcontrib-svg2pdfconverter): Move to ... (gnu): * gnu/packages/sphinx.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/admin.scm, gnu/packages/bioinformatics.scm, gnu/packages/calendar.scm, gnu/packages/cluster.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/elf.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emulators.scm, gnu/packages/finance.scm, gnu/packages/image.scm, gnu/packages/libffi.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm, gnu/packages/openstack.scm, gnu/packages/pdf.scm, gnu/packages/python-web.scm, gnu/packages/search.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/tls.scm, gnu/packages/web.scm: Adjust module imports. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 1 + gnu/packages/bioinformatics.scm | 1 + gnu/packages/calendar.scm | 1 + gnu/packages/cluster.scm | 2 +- gnu/packages/databases.scm | 1 + gnu/packages/dav.scm | 3 +- gnu/packages/disk.scm | 1 + gnu/packages/django.scm | 1 + gnu/packages/elf.scm | 2 +- gnu/packages/emacs-xyz.scm | 1 + gnu/packages/emulators.scm | 2 +- gnu/packages/finance.scm | 1 + gnu/packages/image.scm | 1 + gnu/packages/libffi.scm | 1 + gnu/packages/mail.scm | 1 + gnu/packages/mpd.scm | 2 +- gnu/packages/openstack.scm | 1 + gnu/packages/pdf.scm | 1 + gnu/packages/python-web.scm | 1 + gnu/packages/python-xyz.scm | 328 +---------------------------------- gnu/packages/search.scm | 1 + gnu/packages/sphinx.scm | 369 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/statistics.scm | 1 + gnu/packages/storage.scm | 1 + gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 1 + gnu/packages/tls.scm | 1 + gnu/packages/web.scm | 9 +- 29 files changed, 402 insertions(+), 337 deletions(-) create mode 100644 gnu/packages/sphinx.scm (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/local.mk b/gnu/local.mk index f8366e6ce2..d0745b0056 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -434,6 +434,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/smalltalk.scm \ %D%/packages/sml.scm \ %D%/packages/speech.scm \ + %D%/packages/sphinx.scm \ %D%/packages/spice.scm \ %D%/packages/sqlite.scm \ %D%/packages/squirrel.scm \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e509cdd3a8..75380be594 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -90,6 +90,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages sphinx) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 0a30d0921f..8aba7f1c5f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -110,6 +110,7 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) + #:use-module (gnu packages sphinx) #:use-module (gnu packages statistics) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 2969228ee9..af692e59f2 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages time) #:use-module (gnu packages xml) diff --git a/gnu/packages/cluster.scm b/gnu/packages/cluster.scm index 8d6669cd22..3608d67bed 100644 --- a/gnu/packages/cluster.scm +++ b/gnu/packages/cluster.scm @@ -24,7 +24,7 @@ #:use-module (guix packages) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls)) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c7acc4281a..8a6e3ab00c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -94,6 +94,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) diff --git a/gnu/packages/dav.scm b/gnu/packages/dav.scm index 0bb446bc3c..3b040028a1 100644 --- a/gnu/packages/dav.scm +++ b/gnu/packages/dav.scm @@ -26,7 +26,8 @@ #:use-module (gnu packages check) #:use-module (gnu packages python) #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx)) (define-public radicale (package diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 3211f8dd20..491f7ce881 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages vim) diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index c761a1061b..2ef50bd0f7 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages time)) (define-public python-django diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 99f49eb7a7..09be3a75a3 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -34,7 +34,7 @@ #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages xml)) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0dc14a4898..beb35c8122 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -125,6 +125,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages password-utils) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages sphinx) #:use-module (gnu packages xdisorg) #:use-module (gnu packages shells) #:use-module (gnu packages sqlite) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index a237b0ee1a..23e5a976ce 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -65,9 +65,9 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 592e353723..e1a1e8ab6f 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a86d0e749f..e3956394cc 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages qt) diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index f47f7623b4..c1d50ec314 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ruby) + #:use-module (gnu packages sphinx) #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix build-system ruby)) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 1f54c34962..114ef32a9d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -106,6 +106,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages samba) #:use-module (gnu packages screen) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index a6f6819d3e..f631dbd7c6 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -50,8 +50,8 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages video) #:use-module (gnu packages xiph)) diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 2906a574cf..289b845ebc 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages time) #:use-module (gnu packages tls) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c1153cc0b7..5c858510eb 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages xdisorg) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index a163014c47..5d37e171e4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages tls) #:use-module (gnu packages time) #:use-module (gnu packages web) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e5f9f39694..7e180bf04b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -125,6 +125,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages search) #:use-module (gnu packages shells) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages terminals) #:use-module (gnu packages tex) @@ -2504,174 +2505,6 @@ reStructuredText.") (define-public python2-pygments (package-with-python2 python-pygments)) -(define-public python-sphinxcontrib-websupport - (package - (name "python-sphinxcontrib-websupport") - (version "1.1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-websupport" version)) - (sha256 - (base32 - "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x")))) - (build-system python-build-system) - (arguments - ;; FIXME: Tests depend on Sphinx, which depends on this. - `(#:tests? #f)) - (home-page "http://sphinx-doc.org/") - (synopsis "Sphinx API for web applications") - (description "This package provides a Python API to easily integrate -Sphinx documentation into your web application. It provides tools to -integrate Sphinx documents in web templates and to handle searches.") - (license license:bsd-3))) - -(define-public python2-sphinxcontrib-websupport - (package-with-python2 python-sphinxcontrib-websupport)) - -(define-public python-sphinx - (package - (name "python-sphinx") - (version "1.7.7") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Sphinx" version)) - (sha256 - (base32 - "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; Requires Internet access. - (delete-file "tests/test_build_linkcheck.py") - (substitute* "tests/test_build_latex.py" - (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") - "@pytest.mark.skip()")) - (when (which "python") - ;; XXX: These tests are broken when using Python2: - ;; . - (delete-file "tests/test_api_translator.py") - (delete-file "tests/test_setup_command.py")) - (invoke "make" "test")))))) - (propagated-inputs - `(("python-imagesize" ,python-imagesize) - ("python-sphinx-alabaster-theme" - ,python-sphinx-alabaster-theme) - ("python-babel" ,python-babel) - ("python-snowballstemmer" ,python-snowballstemmer) - ("python-docutils" ,python-docutils) - ("python-jinja2" ,python-jinja2) - ("python-packaging" ,python-packaging) - ("python-pygments" ,python-pygments) - ("python-requests" ,python-requests) - ("python-six" ,python-six) - ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) - (native-inputs - `(("graphviz" ,graphviz) - ("imagemagick" ,imagemagick) ;for "convert" - ("python-html5lib" ,python-html5lib) - ("python-mock" ,python-mock) - ("python-nose" ,python-nose) - ("python-pytest" ,python-pytest))) - (home-page "http://sphinx-doc.org/") - (synopsis "Python documentation generator") - (description "Sphinx is a tool that makes it easy to create documentation -for Python projects or other documents consisting of multiple reStructuredText -sources.") - (license license:bsd-3) - (properties `((python2-variant . ,(delay python2-sphinx)))))) - -(define-public python2-sphinx - (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) - (package - (inherit base) - (native-inputs `(("python2-mock" ,python2-mock) - ("python2-enum34" ,python2-enum34) - ,@(package-native-inputs base))) - (propagated-inputs `(("python2-pytz" ,python2-pytz) - ("python2-typing" ,python2-typing) - ,@(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") - (version "0.2.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "sphinx_rtd_theme" version)) - (sha256 - (base32 - "05rlhjzdyapr2w74jjs7mrm8hi69qskcr5vya9f9drpsys7lpxrd")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; No tests. - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://github.com/snide/sphinx_rtd_theme/") - (synopsis "ReadTheDocs.org theme for Sphinx") - (description "A theme for Sphinx used by ReadTheDocs.org.") - (license license:expat))) - -(define-public python2-sphinx-rtd-theme - (package-with-python2 python-sphinx-rtd-theme)) - -(define-public python-guzzle-sphinx-theme - (package - (name "python-guzzle-sphinx-theme") - (version "0.7.11") - (source - (origin - (method url-fetch) - (uri (pypi-uri "guzzle_sphinx_theme" version)) - (sha256 - (base32 - "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v")))) - (build-system python-build-system) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://github.com/guzzle/guzzle_sphinx_theme") - (synopsis "Sphinx theme used by Guzzle") - (description "This package provides guzzle_sphinx_theme, a theme for the -Sphinx documentation system, used by @uref{http://docs.guzzlephp.org, Guzzle} -and several other projects.") - (license license:expat))) - -(define-public python2-guzzle-sphinx-theme - (package-with-python2 python-guzzle-sphinx-theme)) - (define-public python-bumpversion (package (name "python-bumpversion") @@ -8068,26 +7901,6 @@ files for use with Python.") (home-page "https://github.com/collective/icalendar") (license license:bsd-2))) -(define-public python-sphinxcontrib-newsfeed - (package - (name "python-sphinxcontrib-newsfeed") - (version "0.1.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-newsfeed" version)) - (sha256 - (base32 - "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p")))) - (arguments '(#:tests? #f)) ; No tests. - (build-system python-build-system) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (synopsis "News Feed extension for Sphinx") - (description "Sphinxcontrib-newsfeed is an extension for adding a simple -Blog, News or Announcements section to a Sphinx website.") - (home-page "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed") - (license license:bsd-2))) - (define-public python-args (package (name "python-args") @@ -8887,56 +8700,6 @@ programmatically interfacing with your system's $EDITOR.") (define-public python2-editor (package-with-python2 python-editor)) -(define-public python-sphinxcontrib-programoutput - (package - (name "python-sphinxcontrib-programoutput") - (version "0.10") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-programoutput" version)) - (sha256 - (base32 - "153hhnlbx4688zj9wd64819ps5znc2jlyp5crkgzvn5hxgy99vpx")))) - (build-system python-build-system) - (arguments - ;; FIXME: Many tests are failing and the upstream is gone. - '(#:tests? #f)) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (synopsis "Sphinx extension to include program output") - (description "A Sphinx extension to literally insert the output of arbitrary -commands into documents, helping you to keep your command examples up to date.") - (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") - (license license:bsd-2))) - -(define-public python2-sphinxcontrib-programoutput - (package-with-python2 python-sphinxcontrib-programoutput)) - -(define-public python-sphinx-repoze-autointerface - (package - (name "python-sphinx-repoze-autointerface") - (version "0.8") - (source (origin - (method url-fetch) - (uri (pypi-uri "repoze.sphinx.autointerface" version)) - (sha256 - (base32 - "08ycivzf7bh4a1zcyp31hbyqs1b2c9r26raa3vxjwwmbfqr3iw4f")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; No tests. - (propagated-inputs - `(("python-sphinx" ,python-sphinx) - ("python-zope-interface" ,python-zope-interface))) - (synopsis "Auto-generate Sphinx API docs from Zope interfaces") - (description "This package defines an extension for the Sphinx documentation -system. The extension allows generation of API documentation by -introspection of @code{zope.interface} instances in code.") - (home-page "https://github.com/repoze/repoze.sphinx.autointerface") - (license license:repoze))) - -(define-public python2-sphinx-repoze-autointerface - (package-with-python2 python-sphinx-repoze-autointerface)) - (define-public python-vobject (package (name "python-vobject") @@ -10926,52 +10689,6 @@ English stemmer.") (define-public python2-snowballstemmer (package-with-python2 python-snowballstemmer)) -(define-public python-sphinx-cloud-sptheme - (package - (name "python-sphinx-cloud-sptheme") - (version "1.8.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "cloud_sptheme" version)) - (sha256 - (base32 - "1dniqb6a39yh786f86c4jn666rwnyi1jvzn4616zhcchb7sfdshd")))) - (build-system python-build-system) - ;; FIXME: The 'pypi' release archive does not contain tests. - (arguments '(#:tests? #f)) - (native-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://bitbucket.org/ecollins/cloud_sptheme") - (synopsis "'Cloud' theme for Sphinx documenter") - (description "This package contains the \"Cloud\" theme for Sphinx and some -related extensions.") - (license license:bsd-3))) - -(define-public python2-sphinx-cloud-sptheme - (package-with-python2 python-sphinx-cloud-sptheme)) - -(define-public python-sphinx-alabaster-theme - (package - (name "python-sphinx-alabaster-theme") - (version "0.7.12") - (source (origin - (method url-fetch) - (uri (pypi-uri "alabaster" version)) - (sha256 - (base32 - "00nwwjj2d2ym4s2kk217x7jkx1hnczc3fvm8yxbqmsp6b0nxfqd6")))) - (build-system python-build-system) - (propagated-inputs - `(("python-pygments" ,python-pygments))) - (home-page "https://alabaster.readthedocs.io/") - (synopsis "Configurable sidebar-enabled Sphinx theme") - (description "Alabaster is a visually (c)lean, responsive, configurable -theme for the Sphinx documentation system. It's the default theme of Sphinx.") - (license license:bsd-3))) - -(define-public python2-sphinx-alabaster-theme - (package-with-python2 python-sphinx-alabaster-theme)) - (define-public python-setproctitle (package (name "python-setproctitle") @@ -12276,30 +11993,6 @@ make common patterns shorter and easier.") (define-public python2-utils (package-with-python2 python-utils)) -(define-public python-sphinx-me - (package - (name "python-sphinx-me") - (version "0.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "sphinx-me" version)) - (sha256 - (base32 - "06jzgp213zihnvpcy2y5jy3ykid3apc2ncp2pg6a2g05lhiziglq")))) - (build-system python-build-system) - (home-page "https://github.com/stephenmcd/sphinx-me") - (synopsis "Create a Sphinx documentation shell") - (description - "Create a Sphinx documentation shell for your project and include the -README file as the documentation index. It handles extracting the required -meta data such as the project name, author and version from your project for -use in your Sphinx docs.") - (license license:bsd-2))) - -(define-public python2-sphinx-me - (package-with-python2 python-sphinx-me)) - (define-public python-diff-match-patch (package (name "python-diff-match-patch") @@ -15678,25 +15371,6 @@ file-based data structures that are @code{mmap}ped into memory so that many processes may share the same data.") (license license:asl2.0))) -(define-public python-sphinxcontrib-svg2pdfconverter - (package - (name "python-sphinxcontrib-svg2pdfconverter") - (version "0.1.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "sphinxcontrib-svg2pdfconverter" version)) - (sha256 - (base32 - "1abvbgkkii13q8nsb10r0gc5lm0p9iq1iwhfhakn5ifn6asa0183")))) - (build-system python-build-system) - (propagated-inputs - `(("python-sphinx" ,python-sphinx))) - (home-page "https://github.com/missinglinkelectronics/sphinxcontrib-svg2pdfconverter/releases") - (synopsis "Sphinx SVG to PDF converter extension") - (description "A Sphinx extension to convert SVG images to PDF in case the builder does not support -SVG images natively (e.g. LaTeX).") - (license license:bsd-3))) - (define-public python-pylzma (package (name "python-pylzma") diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index fe51900179..9b2876c359 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml)) diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm new file mode 100644 index 0000000000..28925a0492 --- /dev/null +++ b/gnu/packages/sphinx.scm @@ -0,0 +1,369 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 David Thompson +;;; Copyright © 2015, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2016 Hartmut Goebel +;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2017 Danny Milosavljevic +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017 Frederick M. Muriithi +;;; Copyright © 2017 Christopher Allan Webber +;;; Copyright © 2017 Julien Lepiller +;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Nicolas Goaziou +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages sphinx) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system python) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages graphviz) + #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages time)) + +(define-public python-sphinx + (package + (name "python-sphinx") + (version "1.7.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Sphinx" version)) + (sha256 + (base32 + "0pkkbfj7cl157q550gcs45am5y78ps0h7q6455d64s1zmw01jlvi")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + ;; Requires Internet access. + (delete-file "tests/test_build_linkcheck.py") + (substitute* "tests/test_build_latex.py" + (("@pytest.mark.sphinx\\('latex', testroot='images'\\)") + "@pytest.mark.skip()")) + (when (which "python") + ;; XXX: These tests are broken when using Python2: + ;; . + (delete-file "tests/test_api_translator.py") + (delete-file "tests/test_setup_command.py")) + (invoke "make" "test")))))) + (propagated-inputs + `(("python-imagesize" ,python-imagesize) + ("python-sphinx-alabaster-theme" + ,python-sphinx-alabaster-theme) + ("python-babel" ,python-babel) + ("python-snowballstemmer" ,python-snowballstemmer) + ("python-docutils" ,python-docutils) + ("python-jinja2" ,python-jinja2) + ("python-packaging" ,python-packaging) + ("python-pygments" ,python-pygments) + ("python-requests" ,python-requests) + ("python-six" ,python-six) + ("python-sphinxcontrib-websupport" ,python-sphinxcontrib-websupport))) + (native-inputs + `(("graphviz" ,graphviz) + ("imagemagick" ,imagemagick) ;for "convert" + ("python-html5lib" ,python-html5lib) + ("python-mock" ,python-mock) + ("python-nose" ,python-nose) + ("python-pytest" ,python-pytest))) + (home-page "http://sphinx-doc.org/") + (synopsis "Python documentation generator") + (description "Sphinx is a tool that makes it easy to create documentation +for Python projects or other documents consisting of multiple reStructuredText +sources.") + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-sphinx)))))) + +(define-public python2-sphinx + (let ((base (package-with-python2 (strip-python2-variant python-sphinx)))) + (package + (inherit base) + (native-inputs `(("python2-mock" ,python2-mock) + ("python2-enum34" ,python2-enum34) + ,@(package-native-inputs base))) + (propagated-inputs `(("python2-pytz" ,python2-pytz) + ("python2-typing" ,python2-typing) + ,@(package-propagated-inputs base)))))) + +(define-public python-sphinxcontrib-newsfeed + (package + (name "python-sphinxcontrib-newsfeed") + (version "0.1.4") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-newsfeed" version)) + (sha256 + (base32 + "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p")))) + (arguments '(#:tests? #f)) ; No tests. + (build-system python-build-system) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (synopsis "News Feed extension for Sphinx") + (description "Sphinxcontrib-newsfeed is an extension for adding a simple +Blog, News or Announcements section to a Sphinx website.") + (home-page "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed") + (license license:bsd-2))) + +(define-public python-sphinxcontrib-programoutput + (package + (name "python-sphinxcontrib-programoutput") + (version "0.10") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-programoutput" version)) + (sha256 + (base32 + "153hhnlbx4688zj9wd64819ps5znc2jlyp5crkgzvn5hxgy99vpx")))) + (build-system python-build-system) + (arguments + ;; FIXME: Many tests are failing and the upstream is gone. + '(#:tests? #f)) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (synopsis "Sphinx extension to include program output") + (description "A Sphinx extension to literally insert the output of arbitrary +commands into documents, helping you to keep your command examples up to date.") + (home-page "https://github.com/lunaryorn/sphinxcontrib-programoutput") + (license license:bsd-2))) + +(define-public python2-sphinxcontrib-programoutput + (package-with-python2 python-sphinxcontrib-programoutput)) + +(define-public python-sphinxcontrib-svg2pdfconverter + (package + (name "python-sphinxcontrib-svg2pdfconverter") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-svg2pdfconverter" version)) + (sha256 + (base32 + "1abvbgkkii13q8nsb10r0gc5lm0p9iq1iwhfhakn5ifn6asa0183")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/missinglinkelectronics/sphinxcontrib-svg2pdfconverter/releases") + (synopsis "Sphinx SVG to PDF converter extension") + (description "A Sphinx extension to convert SVG images to PDF in case the builder does not support +SVG images natively (e.g. LaTeX).") + (license license:bsd-3))) + +(define-public python-sphinxcontrib-websupport + (package + (name "python-sphinxcontrib-websupport") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-websupport" version)) + (sha256 + (base32 + "1ff3ix76xi1y6m99qxhaq5161ix9swwzydilvdya07mgbcvpzr4x")))) + (build-system python-build-system) + (arguments + ;; FIXME: Tests depend on Sphinx, which depends on this. + `(#:tests? #f)) + (home-page "http://sphinx-doc.org/") + (synopsis "Sphinx API for web applications") + (description "This package provides a Python API to easily integrate +Sphinx documentation into your web application. It provides tools to +integrate Sphinx documents in web templates and to handle searches.") + (license license:bsd-3))) + +(define-public python2-sphinxcontrib-websupport + (package-with-python2 python-sphinxcontrib-websupport)) + +(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-me + (package + (name "python-sphinx-me") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx-me" version)) + (sha256 + (base32 + "06jzgp213zihnvpcy2y5jy3ykid3apc2ncp2pg6a2g05lhiziglq")))) + (build-system python-build-system) + (home-page "https://github.com/stephenmcd/sphinx-me") + (synopsis "Create a Sphinx documentation shell") + (description + "Create a Sphinx documentation shell for your project and include the +README file as the documentation index. It handles extracting the required +meta data such as the project name, author and version from your project for +use in your Sphinx docs.") + (license license:bsd-2))) + +(define-public python2-sphinx-me + (package-with-python2 python-sphinx-me)) + +(define-public python-sphinx-repoze-autointerface + (package + (name "python-sphinx-repoze-autointerface") + (version "0.8") + (source (origin + (method url-fetch) + (uri (pypi-uri "repoze.sphinx.autointerface" version)) + (sha256 + (base32 + "08ycivzf7bh4a1zcyp31hbyqs1b2c9r26raa3vxjwwmbfqr3iw4f")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs + `(("python-sphinx" ,python-sphinx) + ("python-zope-interface" ,python-zope-interface))) + (synopsis "Auto-generate Sphinx API docs from Zope interfaces") + (description "This package defines an extension for the Sphinx documentation +system. The extension allows generation of API documentation by +introspection of @code{zope.interface} instances in code.") + (home-page "https://github.com/repoze/repoze.sphinx.autointerface") + (license license:repoze))) + +(define-public python2-sphinx-repoze-autointerface + (package-with-python2 python-sphinx-repoze-autointerface)) + +(define-public python-sphinx-alabaster-theme + (package + (name "python-sphinx-alabaster-theme") + (version "0.7.12") + (source (origin + (method url-fetch) + (uri (pypi-uri "alabaster" version)) + (sha256 + (base32 + "00nwwjj2d2ym4s2kk217x7jkx1hnczc3fvm8yxbqmsp6b0nxfqd6")))) + (build-system python-build-system) + (propagated-inputs + `(("python-pygments" ,python-pygments))) + (home-page "https://alabaster.readthedocs.io/") + (synopsis "Configurable sidebar-enabled Sphinx theme") + (description "Alabaster is a visually (c)lean, responsive, configurable +theme for the Sphinx documentation system. It's the default theme of Sphinx.") + (license license:bsd-3))) + +(define-public python2-sphinx-alabaster-theme + (package-with-python2 python-sphinx-alabaster-theme)) + +(define-public python-sphinx-cloud-sptheme + (package + (name "python-sphinx-cloud-sptheme") + (version "1.8.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "cloud_sptheme" version)) + (sha256 + (base32 + "1dniqb6a39yh786f86c4jn666rwnyi1jvzn4616zhcchb7sfdshd")))) + (build-system python-build-system) + ;; FIXME: The 'pypi' release archive does not contain tests. + (arguments '(#:tests? #f)) + (native-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://bitbucket.org/ecollins/cloud_sptheme") + (synopsis "'Cloud' theme for Sphinx documenter") + (description "This package contains the \"Cloud\" theme for Sphinx and some +related extensions.") + (license license:bsd-3))) + +(define-public python2-sphinx-cloud-sptheme + (package-with-python2 python-sphinx-cloud-sptheme)) + +(define-public python-guzzle-sphinx-theme + (package + (name "python-guzzle-sphinx-theme") + (version "0.7.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "guzzle_sphinx_theme" version)) + (sha256 + (base32 + "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/guzzle/guzzle_sphinx_theme") + (synopsis "Sphinx theme used by Guzzle") + (description "This package provides guzzle_sphinx_theme, a theme for the +Sphinx documentation system, used by @uref{http://docs.guzzlephp.org, Guzzle} +and several other projects.") + (license license:expat))) + +(define-public python2-guzzle-sphinx-theme + (package-with-python2 python-guzzle-sphinx-theme)) + +(define-public python-sphinx-rtd-theme + (package + (name "python-sphinx-rtd-theme") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx_rtd_theme" version)) + (sha256 + (base32 + "05rlhjzdyapr2w74jjs7mrm8hi69qskcr5vya9f9drpsys7lpxrd")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; No tests. + (propagated-inputs + `(("python-sphinx" ,python-sphinx))) + (home-page "https://github.com/snide/sphinx_rtd_theme/") + (synopsis "ReadTheDocs.org theme for Sphinx") + (description "A theme for Sphinx used by ReadTheDocs.org.") + (license license:expat))) + +(define-public python2-sphinx-rtd-theme + (package-with-python2 python-sphinx-rtd-theme)) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 277fb2b334..06f0aa1e75 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages tcl) #:use-module (gnu packages tex) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 9e7cd10918..503433be10 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml)) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 136ffec9e7..51ed0317bc 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -37,11 +37,11 @@ #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages perl) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) + #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 88bc992289..84454b2e0e 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) #:use-module (gnu packages textutils) #:use-module (gnu packages xdisorg) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7642935960..bb82efba5d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) #:use-module (gnu packages base) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e5f824d0af..86109ab77a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages docbook) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages bison) @@ -116,13 +117,13 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages qt) #:use-module (gnu packages readline) - #:use-module (gnu packages valgrind) - #:use-module (gnu packages xml) - #:use-module (gnu packages curl) + #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) - #:use-module (gnu packages version-control)) + #:use-module (gnu packages valgrind) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xml)) (define-public httpd (package -- cgit 1.4.1 From ceb1936aa40f1334946d69a7523d1e5480c32b48 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 20:54:02 +0200 Subject: gnu: python-markdown: Update to 3.1.1. * gnu/packages/python-xyz.scm (python-markdown): Update to 3.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e180bf04b..f8bfdc521b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6283,14 +6283,14 @@ Python.") (define-public python-markdown (package (name "python-markdown") - (version "3.1") + (version "3.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Markdown" version)) (sha256 (base32 - "0l62x154r9mgdvfap06gf0nkrmjd7xixlfshsxcdif2nlrlnyjpw")))) + "0yhylk4ffqqs7x086fav4pnfsl1021v7lghznzkififprmmqfl1f")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose) -- cgit 1.4.1 From b2965b26ee17c493689093901f6f4e53ba15b7cb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 11:32:45 +0200 Subject: gnu: python-mako: Update to 1.0.10. * gnu/packages/python-xyz.scm (python-mako): Update to 1.0.10. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4398211afa..c61de4f80f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8340,14 +8340,14 @@ python-xdo for newer bindings.)") (define-public python-mako (package (name "python-mako") - (version "1.0.7") + (version "1.0.10") (source (origin (method url-fetch) (uri (pypi-uri "Mako" version)) (sha256 (base32 - "1bi5gnr8r8dva06qpyx4kgjc6spm2k1y908183nbbaylggjzs0jf")))) + "0r9rysn19fmrxnzfcn7sg20kjhcrx9qri0my9n5vdzp1g2g92rbi")))) (build-system python-build-system) (propagated-inputs `(("python-markupsafe" ,python-markupsafe))) -- cgit 1.4.1 From b8725cdf94a9d4a582853679710c7224c2f30b79 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 11:53:38 +0200 Subject: gnu: python-pysocks: Update to 1.7.0. * gnu/packages/python-xyz.scm (python-pysocks): Update to 1.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c61de4f80f..8db048cd2b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12956,14 +12956,14 @@ requirements is not met.") (define-public python-pysocks (package (name "python-pysocks") - (version "1.6.8") + (version "1.7.0") (source (origin (method url-fetch) (uri (pypi-uri "PySocks" version)) (sha256 (base32 - "0wn6xafwy9c1gamwljw3fyvih5w19qy9xp39zmv8c90ai5ajrr9z")))) + "0z4p31bpqm893cf87qqgb30k7nwd8kqfjwwjm5cvxb6zbyj1w0yr")))) (build-system python-build-system) (arguments `(#:tests? #f)) (home-page "https://github.com/Anorov/PySocks") -- cgit 1.4.1