GNU bug report logs - #76738
[PATCH ruby-team 0/3] Remove python-sphinx-4.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76738 in the body.
You can then email your comments to 76738 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>, sharlatanus <at> gmail.com
Subject: [PATCH ruby-team 0/3] Remove python-sphinx-4.
Date: Tue,  4 Mar 2025 12:32:37 +0100

This patch series removes python-sphinx-4 and fixes dependents.

Nicolas Graves (3):
  gnu: python-sphinx-panels: Update input to python-sphinx-5.
  gnu: python-numpy-documentation: Update python-sphinx native-input.
  gnu: Remove python-sphinx-4.

 gnu/packages/python-xyz.scm | 14 +++++++++++++-
 gnu/packages/sphinx.scm     | 29 +++++++++--------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

-- 
2.48.1

Message #8 received at 76738 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76738 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH ruby-team 2/3] gnu: python-numpy-documentation: Update
 python-sphinx native-input.
Date: Tue,  4 Mar 2025 12:54:13 +0100

* gnu/packages/python-xyz.scm (python-numpy-documentation):
[arguments]{phases}: Add phase 'avoid-external-deps. Adapt phase
'install by removing sphinx.ext.autodoc extension.
[native-inputs]: Replace python-sphinx-4 by python-sphinx. Add
python-sphinx-design.
---
 gnu/packages/python-xyz.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1445c6f302..9e459fffaf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9535,6 +9535,16 @@ (define-public python-numpy-documentation
       #:tests? #f                     ;we're only generating the documentation
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'avoid-external-deps
+            (lambda _
+              ;; XXX: Avoid theme-switcher to avoid sphinx error
+              ;; TemplateNotFound('theme-switcher.html')
+              ;; XXX: Avoid version-switcher because it depends on the value
+              ;; of external https://numpy.org/doc/_static/versions.json
+              (substitute* "doc/source/conf.py"
+                (("\
+\"navbar_end\": \\[\"theme-switcher\", \"version-switcher\", ")
+                 "\"navbar_end\": ["))))
           (add-before 'build 'add-gnu-freefont-to-texmf
             (lambda _
               ;; XXX: The Sphinx-generated tex output specifies the GNU
@@ -9580,6 +9590,7 @@ (define-public python-numpy-documentation
                     (("\"contents\"") "'index'")
                     ;; Disable Sphinx extensions that produce broken Texinfo.
                     ((".*'numpydoc'.*") "")
+                    ((".*'sphinx.ext.autodoc'.*") "")
                     ((".*'sphinx.ext.autosummary'.*") ""))
                   (invoke "make" "info" sphinxopts)
                   ;; Install the HTML documentation.
@@ -9603,7 +9614,8 @@ (define-public python-numpy-documentation
            python-pandas
            python-pydata-sphinx-theme
            python-scipy                 ;used by matplotlib
-           python-sphinx-4
+           python-sphinx
+           python-sphinx-design
            python-sphinx-panels
            texinfo
            (texlive-updmap.cfg
-- 
2.48.1

Message #11 received at 76738 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76738 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH ruby-team 3/3] gnu: Remove python-sphinx-4.
Date: Tue,  4 Mar 2025 12:54:14 +0100

* gnu/packages/sphinx.scm (python-sphinx-4): Delete variable.
---
 gnu/packages/sphinx.scm | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index aab665463f..73fc9e0ad5 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -262,25 +262,6 @@ (define-public python-sphinx-5
            (texlive-updmap.cfg
             (list texlive-cm-super texlive-tex-gyre))))))
 
-;; Some packages do not support Sphinx 5 yet.  Remove when unused.
-(define-public python-sphinx-4
-  (package
-    (inherit python-sphinx-5)
-    (version "4.5.0")
-    (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "Sphinx" version))
-              (sha256
-               (base32
-                "1rp28jryxwy24y8vpacclqihbizyi6b1s6id86pibvm46ybcmy3v"))))
-    (propagated-inputs
-     (modify-inputs (package-propagated-inputs python-sphinx)
-       (replace "python-docutils" python-docutils-0.15)))
-    (native-inputs
-     (modify-inputs (package-native-inputs python-sphinx)
-       (delete python-flit-core)
-       (append python-setuptools python-wheel)))))
-
 (define-public python-sphinxcontrib-apidoc
   (package
     (name "python-sphinxcontrib-apidoc")
-- 
2.48.1

Message #14 received at 76738 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76738 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves <at> ngraves.fr>
Subject: [PATCH ruby-team 1/3] gnu: python-sphinx-panels: Update input to
 python-sphinx-5.
Date: Tue,  4 Mar 2025 12:54:12 +0100

* gnu/packages/sphinx.scm (python-sphinx-panels):
[arguments]{phases}: Add 'loosen-requirements phase.
[propagated-inputs]: Replace python-sphinx-4 by python-sphinx-5.
---
 gnu/packages/sphinx.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm
index 13a1701e0a..aab665463f 100644
--- a/gnu/packages/sphinx.scm
+++ b/gnu/packages/sphinx.scm
@@ -603,7 +603,15 @@ (define-public python-sphinx-panels
         (sha256
          (base32 "1ivqz6yv96a2jp59kylg1gbkrmzq6zwilppz3ij0zrkjn25zb97k"))))
     (build-system pyproject-build-system)
-    (propagated-inputs (list python-docutils-0.15 python-sphinx-4))
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'loosen-requirements
+                 (lambda _
+                   (substitute* "setup.py"
+                     (("sphinx>=2,<5")
+                      "sphinx>=2,<6")))))))
+    (propagated-inputs (list python-docutils-0.15 python-sphinx-5))
     (native-inputs
      (list python-pytest
            python-pytest-regressions
-- 
2.48.1

Message #19 received at 76738-done <at> debbugs.gnu.org (full text, mbox):

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 76738-done <at> debbugs.gnu.org
Subject: [PATCH ruby-team 0/3] Remove python-sphinx-4.
Date: Fri, 07 Mar 2025 22:14:48 +0000

[Message part 1 (text/plain, inline)]

Hi,

I've rebased ruby-team on master HEAD
a5182cf20aaf4dab79f11bfa8545eadb9e4e867b, applied patches successfully,
pushed.

Let's watch CI now!

---
Thanks,
Oleg

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.