From patchwork Thu Oct 13 17:29:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Corbet X-Patchwork-Id: 2112 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp397377wrs; Thu, 13 Oct 2022 10:37:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7TrTHzEX/3K2Nm/Tosx68vk0o0r7b0BfBdO7auXnPrBaChBy5Sxt0QGl/WSl4+vTc1EYnN X-Received: by 2002:a17:906:8a64:b0:78d:b00d:fe with SMTP id hy4-20020a1709068a6400b0078db00d00femr680704ejc.32.1665682630770; Thu, 13 Oct 2022 10:37:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665682630; cv=none; d=google.com; s=arc-20160816; b=B89QByF/k2ydBEohHa2OcLk+4UBHMMTXT5hk6nb0F1mBr9g3T3Jw6Nrh9lrNUN5br0 S5pIlGtObdV9un2qUP9W6V6KPGEwJqqbGqEABTbvGKv3GX9Buyd4uj1Nhy/sB278MQZ1 SSn5GARbsBAUC1R9OeaJuBEzljLY2e+qVa0bTA67K/WvNuJ7Wwch/jaN8LNx8XGdiWhd AbBIfPO8lf0js7W56KuWUTfKfJ1R7WkOgF1iLnhhzrEiGcSI+UZk1nQq6ZN5izVcC3OW X19EWWePK+7M2ENYjNe5XBCKrXQ53cGTnAJRUVTp0+8poAnsAgDpLCNa64+gH9RZO+Ym DZmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=w3wkfghYAXmRJrVxbzZZnrDjz+QM31pXF6acX37HbWw=; b=qY7CobIRh44+//LIx8ZM4nkMnI6Zyu2SleyS7kD8/pR/pwtpusbeqJQe0c3O2UmzyM AQewOdykkeWyRsQFeAP4Q7cjQr5tFs/lrMwB7zuJZGMYQLfCeQCndJ5xjxTb6wtzs3rB VevqvlZKD/ykMqKaDBlRCZuq4LlXVs4Xy6CuW723RKBpI7CeqIqoJbBhPsz6lzHZ9jhO OEALRRvdXMiT0CztEDuRYNphRHzt0K6tnzh9NN1v5tSURpRApURkMIXjJfzIAeiWV/JV 8EPArNoiJqZhORs6LNaaJza6B9HNm0eFPyyXVGyFYN7MPMHPyMEkpv2zv5Hw6Ru7Yy5i 5Ebg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=D3GqwBum; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cr13-20020a170906d54d00b00779e6c93108si218915ejc.598.2022.10.13.10.36.45; Thu, 13 Oct 2022 10:37:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@lwn.net header.s=20201203 header.b=D3GqwBum; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbiJMR3q (ORCPT + 99 others); Thu, 13 Oct 2022 13:29:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229833AbiJMR32 (ORCPT ); Thu, 13 Oct 2022 13:29:28 -0400 Received: from ms.lwn.net (ms.lwn.net [45.79.88.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F35C5C34E3; Thu, 13 Oct 2022 10:29:27 -0700 (PDT) Received: from meer.lwn.net (unknown [IPv6:2601:281:8300:73:8b7:7001:c8aa:b65f]) by ms.lwn.net (Postfix) with ESMTPA id 9186D7F9; Thu, 13 Oct 2022 17:29:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 ms.lwn.net 9186D7F9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lwn.net; s=20201203; t=1665682167; bh=w3wkfghYAXmRJrVxbzZZnrDjz+QM31pXF6acX37HbWw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D3GqwBumdV9U5+dZCyn903icHDcZ0uZ7BAbUH5iFPTIHMBLomaKDd69BNFNW7PfGG KEoM+skcQbCegEuK9EwC9MS38pqVyAzTaDZHPogH4+svnQa+gqCt1iAWdXT7DCmrdg Vsz52LzlkcBtb+2noB22zVdhcMKgBEzHHFJNcMieCXYq51EZMgkqcPra4txdQAVYJm IXk+y3mBY1wp0OpPUALKP7IS+53CFl6TydYVrQYgawRqtq77ews1PeSS9Ygvf2rvPL TCLoVGs3uL+l0UNXW04tNjUsUbqOYwkUoRfzQJsVs+kECN/rHigQcwUNjgYjK51Xa7 ZDNXCfqjGT8rw== From: Jonathan Corbet To: linux-doc@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH v3 4/6] docs: sphinx-pre-install: don't require the RTD theme Date: Thu, 13 Oct 2022 11:29:16 -0600 Message-Id: <20221013172918.846856-5-corbet@lwn.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221013172918.846856-1-corbet@lwn.net> References: <20221013172918.846856-1-corbet@lwn.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746594830338830900?= X-GMAIL-MSGID: =?utf-8?q?1746594830338830900?= We don't default to the RTD theme anymore, so sphinx-pre-install need not insist on installing it. Acked-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/sphinx/requirements.txt | 1 - scripts/sphinx-pre-install | 8 -------- 2 files changed, 9 deletions(-) diff --git a/Documentation/sphinx/requirements.txt b/Documentation/sphinx/requirements.txt index 2c573541ab71..335b53df35e2 100644 --- a/Documentation/sphinx/requirements.txt +++ b/Documentation/sphinx/requirements.txt @@ -1,4 +1,3 @@ # jinja2>=3.1 is not compatible with Sphinx<4.0 jinja2<3.1 -sphinx_rtd_theme Sphinx==2.4.4 diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install index ec84fc62774e..1fb88fdceec3 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -362,7 +362,6 @@ sub give_debian_hints() { my %map = ( "python-sphinx" => "python3-sphinx", - "sphinx_rtd_theme" => "python3-sphinx-rtd-theme", "ensurepip" => "python3-venv", "virtualenv" => "virtualenv", "dot" => "graphviz", @@ -397,7 +396,6 @@ sub give_redhat_hints() { my %map = ( "python-sphinx" => "python3-sphinx", - "sphinx_rtd_theme" => "python3-sphinx_rtd_theme", "virtualenv" => "python3-virtualenv", "dot" => "graphviz", "convert" => "ImageMagick", @@ -475,7 +473,6 @@ sub give_opensuse_hints() { my %map = ( "python-sphinx" => "python3-sphinx", - "sphinx_rtd_theme" => "python3-sphinx_rtd_theme", "virtualenv" => "python3-virtualenv", "dot" => "graphviz", "convert" => "ImageMagick", @@ -523,7 +520,6 @@ sub give_mageia_hints() { my %map = ( "python-sphinx" => "python3-sphinx", - "sphinx_rtd_theme" => "python3-sphinx_rtd_theme", "virtualenv" => "python3-virtualenv", "dot" => "graphviz", "convert" => "ImageMagick", @@ -567,7 +563,6 @@ sub give_mageia_hints() sub give_arch_linux_hints() { my %map = ( - "sphinx_rtd_theme" => "python-sphinx_rtd_theme", "virtualenv" => "python-virtualenv", "dot" => "graphviz", "convert" => "imagemagick", @@ -598,7 +593,6 @@ sub give_arch_linux_hints() sub give_gentoo_hints() { my %map = ( - "sphinx_rtd_theme" => "dev-python/sphinx_rtd_theme", "virtualenv" => "dev-python/virtualenv", "dot" => "media-gfx/graphviz", "convert" => "media-gfx/imagemagick", @@ -895,7 +889,6 @@ sub recommend_sphinx_version($) $verbose_warn_install = 0; add_package("python-sphinx", 0); - check_python_module("sphinx_rtd_theme", 1); check_distros(); @@ -968,7 +961,6 @@ sub check_needs() check_perl_module("Pod::Usage", 0); check_program("make", 0); check_program("gcc", 0); - check_python_module("sphinx_rtd_theme", 1) if (!$virtualenv); check_program("dot", 1); check_program("convert", 1);