From patchwork Sun Mar 9 22:11:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 39995 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2BC1127BBEA; Sun, 9 Mar 2025 22:14:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 782FE27BBE2 for ; Sun, 9 Mar 2025 22:14:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trOtg-0000w0-80; Sun, 09 Mar 2025 18:13:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trOtQ-0000oO-4o for guix-patches@gnu.org; Sun, 09 Mar 2025 18:13:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trOtP-0002Hn-Rq for guix-patches@gnu.org; Sun, 09 Mar 2025 18:13:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4YTWpvZ5s1O1wGFO7oUiGM3oi9yeZmF1Xvy96WdGT9g=; b=YvM9/pRIx4oy6iJNl2R5jhp7LbH10L/GF0FEXgdB9uoJHqP/r1eCeq5JHHEtowfc64Cc/UO5YoVMDfi6GBqfvtJUFGXIOAyRLKxgp6q0mfZYMKLp/69UBXB1AsKEds15SfSKb3IxJWtvNr/U4adX5ECcVGG+3KlUhHnOnhCnyk3AWBY+wu9xTFue6m4+FcVrN7Sn1/NQEnRzVRf7Xv/4Y+EZVcqF7lX7FtF1uRTOCQDh9yn13OQ8pbKa5E9ttlPaEwHzOwt4awdbE1isD+nuHNtQGb1KesF2SkqP2kc55vmZBwwkzA0Q32eEX5OygwDvJapaull2K91YcBnIkVaNCg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1trOtP-0000ax-Na for guix-patches@gnu.org; Sun, 09 Mar 2025 18:13:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76835] [PATCH v2 14/24] gnu: python-numpy-documentation: Update python-sphinx native-input. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Mar 2025 22:13:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76835 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76835@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 76835-submit@debbugs.gnu.org id=B76835.17415583562086 (code B ref 76835); Sun, 09 Mar 2025 22:13:07 +0000 Received: (at 76835) by debbugs.gnu.org; 9 Mar 2025 22:12:36 +0000 Received: from localhost ([127.0.0.1]:34803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1trOst-0000XY-NX for submit@debbugs.gnu.org; Sun, 09 Mar 2025 18:12:36 -0400 Received: from 20.mo582.mail-out.ovh.net ([178.32.124.17]:33179) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1trOse-0000VP-2Z for 76835@debbugs.gnu.org; Sun, 09 Mar 2025 18:12:20 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.25.23]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4Z9vQW0399z1Vbm for <76835@debbugs.gnu.org>; Sun, 9 Mar 2025 22:12:19 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-48h5b (unknown [10.110.164.113]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BCBAA1FD1D; Sun, 9 Mar 2025 22:12:18 +0000 (UTC) Received: from ngraves.fr ([37.59.142.114]) by ghost-submission-5b5ff79f4f-48h5b with ESMTPSA id lPnaJkISzmeQcREAzjJ9yg (envelope-from ); Sun, 09 Mar 2025 22:12:18 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-114S0084bc35057-6248-4315-9183-2579c44d20cd, 196D73215860B9B374AEA1D4B43499A65472C7F7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Mar 2025 23:11:22 +0100 Message-ID: <20250309221153.334-14-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250309221153.334-1-ngraves@ngraves.fr> References: <20250309221153.334-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 1315614043050402530 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudejieduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptddtgefhteeikeehffeuueefffelvefgueffteffjeefhedvjeeihedtjedvteevnecuffhomhgrihhnpehnuhhmphihrdhorhhgnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduudegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieekfeehseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedvmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=4YTWpvZ5s1O1wGFO7oUiGM3oi9yeZmF1Xvy96WdGT9g=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1741558339; v=1; b=owjvEEizO0TI3+2O8kL4BWJBjn/vgODXwK7dJYiZeDSuCssQ4ce3Ka0wcKW3vImrnNSDWZup bH9EIQZ0znkVRi9h/ps7h4SH/WdFI4BXt6haVhusPDxWk8b0qrA3CuTP77FPUImixOxAmDteLyF ogiMqfuD58FgQaKX8Q/ahNHUmHJXrTyVE4zzOkejy9GBJhpZ22JaPn7aWfWk/Wx7R2MemRMkKia bL9fUUKJiBfj5470zrb+R2p3GhjgAEJIxWJfM0hw3V1otEOTgHWQOJ7wYGf+gE0eVSAiF8to4zC +qiarv+DcoABTdf3gWmwtlN0L2GqaYtRF4TJLR/l2jGeA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 bacfac6c42..6054a88562 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9684,6 +9684,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 @@ -9729,6 +9739,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. @@ -9752,7 +9763,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