From patchwork Fri Mar 7 19:15:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 39798 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 D8ABC27BBEA; Fri, 7 Mar 2025 19:22:53 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, 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 30EED27BBE2 for ; Fri, 7 Mar 2025 19:22:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqdFL-0008K0-3H; Fri, 07 Mar 2025 14:20:36 -0500 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 1tqdBw-0000eP-AQ for guix-patches@gnu.org; Fri, 07 Mar 2025 14:17:06 -0500 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 1tqdBv-0004d7-Ex for guix-patches@gnu.org; Fri, 07 Mar 2025 14:17:03 -0500 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=/xudMIRiZewQTBE9P5gGfgW7p6zko+j2V/cwWGUMRRU=; b=dPx9Brwrd0Dh0ZPjKl7obeEAYBCNWuBW/9cXA5cJv6IO/OGa+Adi04xfphR7N4/3yMVaC8Gc1Oy2GnHX7GWHJQMZq3gDpHxp27lt/E0eaA/oy0uqYmf7vsXfQ8Wnkfy4+AnVligkblv57v4rRdZJsGPpethjmPpGErpOsF2sbPY2EzGt2j3P1+0N0Awe8ozKKligFeEVyD+SV88Aqj/DOVeXuAWmeQzxpzUEnTPX7Q++3A33MeZwk5QF+qNQtMXcL9fyJL/0ItO4LKmH3KmHZFzEGjr0Sh8s6WtFKoIfhAuD8NsO7Nj23UQc4UyhuXdIfLYNCpEVSqRgxUUDIDGG0Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tqdBv-00038J-9E for guix-patches@gnu.org; Fri, 07 Mar 2025 14:17:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76837] [PATCH 14/15] 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: Fri, 07 Mar 2025 19:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76837 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76835@debbugs.gnu.org Cc: 76837@debbugs.gnu.org X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via Received: via spool by submit@debbugs.gnu.org id=B.174137497311905 (code B ref -1); Fri, 07 Mar 2025 19:17:03 +0000 Received: (at submit) by debbugs.gnu.org; 7 Mar 2025 19:16:13 +0000 Received: from localhost ([127.0.0.1]:50443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tqdB6-00035u-Vk for submit@debbugs.gnu.org; Fri, 07 Mar 2025 14:16:13 -0500 Received: from lists.gnu.org ([2001:470:142::17]:60666) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tqdAz-00032h-KJ for submit@debbugs.gnu.org; Fri, 07 Mar 2025 14:16:06 -0500 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 1tqdAe-0006Ly-PX for guix-patches@gnu.org; Fri, 07 Mar 2025 14:15:44 -0500 Received: from 12.mo561.mail-out.ovh.net ([188.165.41.191]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tqdAc-0001TP-2w for guix-patches@gnu.org; Fri, 07 Mar 2025 14:15:44 -0500 Received: from director9.ghost.mail-out.ovh.net (unknown [10.108.25.136]) by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Z8bbb2rdRz1Txv for ; Fri, 7 Mar 2025 19:15:39 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-rrkpn (unknown [10.111.182.20]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BCB941FD62; Fri, 7 Mar 2025 19:15:38 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-5b5ff79f4f-rrkpn with ESMTPSA id CMpLF9pFy2cE7wQAUF0UpA (envelope-from ); Fri, 07 Mar 2025 19:15:38 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G006c2fc144d-6c43-432d-a367-d2068abc9908, 93CD87FFD4632086FD827B47E208BFE70AFEC0F0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Fri, 7 Mar 2025 20:15:12 +0100 Message-ID: <20250307191522.22228-14-ngraves@ngraves.fr> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250307191522.22228-1-ngraves@ngraves.fr> References: <20250307191522.22228-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 5033617010519565050 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduuddugeejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedttdeghfetieekheffueeufeffleevgfeuffetffejfeehvdejieehtdejvdetveenucffohhmrghinhepnhhumhhphidrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedumgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=/xudMIRiZewQTBE9P5gGfgW7p6zko+j2V/cwWGUMRRU=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1741374939; v=1; b=EeNL0G/+Dt12S5CFn4Zt+Nbe6Qy0PEWMw17EpJ1c9xKlgXfMod3fGjzqI8PSlNpqZV9b6d9o zFc4Mz3GP5sEYxthj4jwfqY6cmSQENdFiUh6l4XHhmNn1idmvtcRqlfJF54y+5fdybOC82yVSzX zvT3qzN8rTpX67210XzyeCxk5Wt2Tqml/uH/icilgld9BoXG+duU0HwQ7jQx5LZR1UvuLwmGUG2 Y6UMYZSX5fMhVDtprZOPmQKB3OtnsMImh7DwCtRzgLw2D6kfJ3P6tp2kfwR0w6tvTTXCO1Fqw1n vT83Hc6yPGUe3hMxufCsIwD7OtR1/6EUBLAfKFhY/5ZLQ== Received-SPF: pass client-ip=188.165.41.191; envelope-from=ngraves@ngraves.fr; helo=12.mo561.mail-out.ovh.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From: Nicolas Graves via Guix-patches via * 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