gnu: python-sphinx: Update to 6.2.1.

* gnu/packages/sphinx.scm (python-sphinx): Update to 6.2.1.
[arguments]: Only disable one test.
[propagated-inputs]: Add texlive-booktabs.
(python-sphinx-5): New variable, inherit from python-sphinx.

Change-Id: I95144924c4c0f293993bfbd7b644c378dd160077

1 files changed, 40 insertions, 41 deletions

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index bfb2d78ec4..40bb672e05 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -68,37 +68,38 @@
 (define-public python-sphinx
   (package
     (name "python-sphinx")
-    (version "5.1.1")
+    (version "6.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "Sphinx" version))
        (sha256
         (base32
-         "12cdy3m5c09lpf2bbxzbhm5v5y9fk7jgm94qrzggpq86waj28cms"))))
-    (build-system python-build-system)
+         "0sycp5qx7py75fvmjz0av5awfdlqn72azzjj07x9yx5vjx3a6mkd"))))
+    (build-system pyproject-build-system)
     (arguments
-     `(;; Make sure it is safe to use 'imagemagick' instead of
-       ;; 'imagemagick/stable' (see the comment for the "imagemagick" input).
-       #:disallowed-references (,imagemagick/stable)
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'check
-           (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()"))
-               (setenv "HOME" "/tmp")   ;for test_cython
-               (invoke "make" "test")))))))
+     (list
+      #:test-flags
+      ;; These require Internet access.
+      '(list "-k" "not test_latex_images")
+      #:phases
+      '(modify-phases %standard-phases
+        (add-before 'check 'pre-check
+          (lambda _
+            ;; for test_cython
+            (setenv "HOME" "/tmp"))))))
     (propagated-inputs
      (list python-babel
+           python-colorama
            python-docutils
-           python-jinja2
+           python-filelock
+           python-flake8
+           python-html5lib
            python-imagesize
            python-importlib-metadata
+           python-isort
+           python-jinja2
+           python-mypy
            python-packaging
            python-pygments
            python-requests
@@ -110,51 +111,49 @@
            python-sphinxcontrib-jsmath
            python-sphinxcontrib-qthelp
            python-sphinxcontrib-serializinghtml
+           python-sphinxcontrib-websupport
+           python-types-requests
 
            ;; The Sphinx LaTeX library '\RequirePackage' or \\usepackage
            ;; these:
-           texlive-scheme-basic         ;for a valid TeX Live tree
-           texlive-anyfontsize
+           texlive-amsfonts             ;amsmath, amssymb, amstext
+           texlive-amsmath
+           texlive-booktabs
            texlive-capt-of
-           texlive-cm-super
+           texlive-carlisle             ;remreset
            texlive-cmap
            texlive-etoolbox
+           texlive-fancyhdr
            texlive-fancyvrb
            texlive-float
            texlive-fncychap
-           texlive-fontspec
            texlive-framed
-           texlive-luatex85
-           texlive-luatexbase
+           texlive-geometry
+           texlive-hyperref
+           texlive-kvoptions
+           texlive-latex-bin
+           texlive-ltxcmds
            texlive-needspace
+           texlive-oberdiek             ;hypcap
            texlive-parskip
-           texlive-polyglossia
            texlive-preview
            texlive-tabulary
-           texlive-tex-gyre
            texlive-titlesec
+           texlive-tools                ;multicol, longtable
            texlive-upquote
            texlive-varwidth
            texlive-wrapfig
            texlive-xcolor))
     (native-inputs
-     (list fontconfig
-           font-gnu-freefont
-           ;; imagemagick is added for "convert".  The store item does not
-           ;; retain a reference to imagemagick, so it should be safe to use
-           ;; 'imagemagick/stable' instead of 'imagemagick'.  This is enforced
-           ;; by the '#:disallowed-references' above.
-           imagemagick/stable
+     (list imagemagick                  ;for "convert"
            python-cython
-           python-html5lib
-           python-pytest
-           (texlive-updmap.cfg
-            (list texlive-cm-super texlive-tex-gyre))))
+           python-flit-core
+           python-pytest))
     (home-page "https://www.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.")
+    (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-2)))
 
 ;; Some packages do not support Sphinx 5 yet.  Remove when unused.