diff options
Diffstat (limited to 'gnu/packages/sphinx.scm')
| -rw-r--r-- | gnu/packages/sphinx.scm | 54 |
1 files changed, 39 insertions, 15 deletions
diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 9aafcb9213..471988b178 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr> +;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) @@ -56,26 +58,27 @@ (define-public python-sphinx (package (name "python-sphinx") - (version "3.3.1") + (version "4.2.0") (source (origin (method url-fetch) (uri (pypi-uri "Sphinx" version)) (sha256 (base32 - "0023vc2i29pjxmvdqbz1wdbi7gbj56y1br1b2z8h8wa44li5k38y")))) + "19jq21py7m061v8142y2dbqrbv0adqcdjmharrdy34a432wqs1wl")))) (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()")) - (invoke "make" "test")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; 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()")) + (invoke "make" "test"))))))) (propagated-inputs `(("python-babel" ,python-babel) ("python-docutils" ,python-docutils) @@ -132,6 +135,8 @@ sources.") ;; <https://github.com/sphinx-doc/sphinx/issues/4710>. '("tests/test_api_translator.py" "tests/test_setup_command.py" + ;; Websupport is provided by a separate package + "tests/test_websupport.py" ;; This one fails for unknown reasons. "tests/test_correct_year.py")))))))) (native-inputs `(("python2-mock" ,python2-mock) @@ -245,13 +250,13 @@ users from Sphinx docs.") (define-public python-sphinxcontrib-htmlhelp (package (name "python-sphinxcontrib-htmlhelp") - (version "1.0.3") + (version "2.0.0") (source (origin (method url-fetch) (uri (pypi-uri "sphinxcontrib-htmlhelp" version)) (sha256 (base32 - "16v5jdnibwrqjdr5aqchgyzpwy3rgamwhdf4kidv5nxj65zbpxg8")))) + "1ckd5xx4ngd6f4prxbc1bbvnafy1gg06j3bxyj5kk7v21lnvpy7m")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;XXX: circular dependency on Sphinx @@ -350,13 +355,13 @@ documents.") (define-public python-sphinxcontrib-serializinghtml (package (name "python-sphinxcontrib-serializinghtml") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (pypi-uri "sphinxcontrib-serializinghtml" version)) (sha256 (base32 - "1g3pbx0g88zd9xzcrbaypa2k60axrh92vf5j76wsk0p9hv6fr87a")))) + "0lk91cl9bi4ynhz971zjs0bsr7jwxx8mx2f40psrx06zvzjnspxa")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;XXX: circular dependency on Sphinx @@ -405,10 +410,29 @@ builder does not support SVG images natively (e.g. LaTeX).") (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))) + (license license:bsd-3) + (properties `((python2-variant . ,(delay python2-sphinxcontrib-websupport)))))) +;; 1.1.2 is the last version to support Python 2. (define-public python2-sphinxcontrib-websupport - (package-with-python2 python-sphinxcontrib-websupport)) + (package + (inherit (package-with-python2 + (strip-python2-variant python-sphinxcontrib-websupport))) + (version "1.1.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "sphinxcontrib-websupport" version)) + (sha256 + (base32 + "1z7fqra0xm1cdp8vvp80fcvnjlywym7bzz80m0liq7fz1zxvw08m")))) + (arguments + `(#:tests? #f + #:python ,python-2 + #:phases + (modify-phases %standard-phases + (delete 'sanity-check)))) + (propagated-inputs + `(("python2-six" ,python2-six))))) (define-public python-sphinx-gallery (package |