From nobody Sat Nov 15 17:17:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1749243059; cv=none; d=zohomail.com; s=zohoarc; b=OjCmdI86CotSG3e09J+IAEZB8Cpg5CT8TslBfEAcBxvjuLHQritdhNhsMGsxuAuCoFQMAoeDRUMRDB1KrDpBbGdPIX5g0O/zKsnuCk38hMJ+9ZzQ8qCp5426MJOJZy1bkc2NJI4ol3KE5BV78fjj/Wy24FJA3VFfbpfhUNey9L0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749243059; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GRhGqsdjHlcdtOThhMwkVpv7y+rIn5IxVqeOj32kKGs=; b=Sf58INHy6v+sGxubjyB9SxmUSrVvIR9EVBRCQ7TvRQ9gyGGvf8bHcutaOjUUcZndpive34EuUEyaF5U9OC4M5WtF1jSpS+0qd5RZqK222zj1Jb8ZWEguYdUFhVpNGqmahLG8BLRR8365kDM1H2yQcgHnrKYSenKE4vgLkt6/IGk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1749243059757614.1435011592878; Fri, 6 Jun 2025 13:50:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uNe1B-0000jb-TT; Fri, 06 Jun 2025 16:50:26 -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 1uNe17-0000iI-6E for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uNe14-0006oV-Ui for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:20 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-114-G2qu1HA2MbKkqyoHvUMdxg-1; Fri, 06 Jun 2025 16:50:14 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C3CC9180047F; Fri, 6 Jun 2025 20:50:12 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C2E0430001B7; Fri, 6 Jun 2025 20:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749243015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GRhGqsdjHlcdtOThhMwkVpv7y+rIn5IxVqeOj32kKGs=; b=gSb2cr6JMSaeRxNjTgqCTDL9h7BDO3rK8hYuqbfV1KVFdop7DleFyMVNOXczE80qVM2ybT 1kLRQe4lsyjuJlYehsQ/86kWr5WhqqXwWrXirT2alqhUEUp0/TpmrtQLViARYv8QoZcaCT dhmvI+3NkpwjZuxlzITCfmzC9juXf4w= X-MC-Unique: G2qu1HA2MbKkqyoHvUMdxg-1 X-Mimecast-MFC-AGG-ID: G2qu1HA2MbKkqyoHvUMdxg_1749243013 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , Peter Maydell , Akihiko Odaki , Cleber Rosa Subject: [PATCH 1/4] python: update requirements for Sphinx Date: Fri, 6 Jun 2025 16:50:06 -0400 Message-ID: <20250606205009.584615-2-jsnow@redhat.com> In-Reply-To: <20250606205009.584615-1-jsnow@redhat.com> References: <20250606205009.584615-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.104, 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_H5=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: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1749243062959116600 Content-Type: text/plain; charset="utf-8" In advance of actually bumping the build system requirements for Sphinx, bump the version used for the static analysis tests. Update the minimum requirements accordingly. This changes the test environment without actually changing the build requirements, and no extra changes are needed for the tests to continue passing. Signed-off-by: John Snow Reviewed-by: Akihiko Odaki Tested-by: Markus Armbruster --- python/setup.cfg | 2 +- python/tests/minreqs.txt | 36 +++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/python/setup.cfg b/python/setup.cfg index d7f5dc7bafe..dc9615c1173 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -46,7 +46,7 @@ devel =3D urwid >=3D 2.1.2 urwid-readline >=3D 0.13 Pygments >=3D 2.9.0 - sphinx >=3D 3.4.3 + sphinx >=3D 6.2.1 =20 # Provides qom-fuse functionality fuse =3D diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index cd2e2a81c3d..fd7ec40929b 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -11,19 +11,19 @@ # When adding new dependencies, pin the very oldest non-yanked version # on PyPI that allows the test suite to pass. =20 -# For some reason, the presence of packaging=3D=3D14.0 below requires us to +# For some reason, the presence of packaging=3D=3D21.0 below requires us to # also pin setuptools to version 70 or below. Otherwise, the # installation of the QEMU package itself fails, failing to find # setuptools. setuptools<=3D70 =20 # Dependencies for qapidoc/qapi_domain et al -sphinx=3D=3D3.4.3 +sphinx=3D=3D6.2.1 =20 # Dependencies for the TUI addon (Required for successful linting) urwid=3D=3D2.1.2 urwid-readline=3D=3D0.13 -Pygments=3D=3D2.9.0 +Pygments=3D=3D2.13.0 =20 # Dependencies for mkvenv distlib=3D=3D0.3.6 @@ -55,24 +55,30 @@ astroid=3D=3D2.15.4 dill=3D=3D0.2 lazy-object-proxy=3D=3D1.4.0 platformdirs=3D=3D2.2.0 -toml=3D=3D0.10.0 tomlkit=3D=3D0.10.1 wrapt=3D=3D1.14.0 =20 # Transitive sphinx dependencies -Jinja2=3D=3D2.7 -MarkupSafe=3D=3D1.1.0 +Jinja2=3D=3D3.0 +MarkupSafe=3D=3D2.0.0 alabaster=3D=3D0.7.1 -babel=3D=3D1.3 -docutils=3D=3D0.12 -imagesize=3D=3D0.5.0 -packaging=3D=3D14.0 -pytz=3D=3D2011b0 -requests=3D=3D2.5.0 -snowballstemmer=3D=3D1.1 +babel=3D=3D2.9 +certifi=3D=3D2017.4.17 +chardet=3D=3D3.0.2 +docutils=3D=3D0.18.1 +idna=3D=3D2.5 +imagesize=3D=3D1.3 +importlib-metadata=3D=3D4.8.1 +packaging=3D=3D21.0 +pyparsing=3D=3D2.0.2 +pytz=3D=3D2015.7 +requests=3D=3D2.25.0 +snowballstemmer=3D=3D2.0 sphinxcontrib-applehelp=3D=3D1.0.0 sphinxcontrib-devhelp=3D=3D1.0.0 -sphinxcontrib-htmlhelp=3D=3D1.0.0 +sphinxcontrib-htmlhelp=3D=3D2.0.0 sphinxcontrib-jsmath=3D=3D1.0.0 sphinxcontrib-qthelp=3D=3D1.0.0 -sphinxcontrib-serializinghtml=3D=3D1.0.0 +sphinxcontrib-serializinghtml=3D=3D1.1.5 +urllib3=3D=3D1.21.1 +zipp=3D=3D0.5 --=20 2.48.1 From nobody Sat Nov 15 17:17:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1749243059; cv=none; d=zohomail.com; s=zohoarc; b=N1A9OxjarNen4/8GrYwoGvpOcBRHz6i62g+jwcT/CZSB/PzRy/U+MUkWseUF+E1jNhUer4fnSnMVUmcsp+ODU7qO8SESLWya+DegCxs3Wo7k1YsxrXHcSjRtxw8htrzxFwDKCOuOZjagvkwsdhW9xPQfzaQ7H/ZK31gILjdqCWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749243059; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=E6EjVPsLrNhvnNwp1UJ0tdgE37dKoZfSM4H2nVcEoEg=; b=Mxn+tHfmjbs34D+Pu9PdjVNDbNBUbu5lu4Pta+LZ6gSb0GKkH2OwLRUiRqt7BkrvXPdxz6HqxF7PsGYD06hRPzWaxJvyW9KfzF5+A68SAPypFQycoVOyfviVqL1MJkRJA0ALRoiSb6XljtEsSt04A4dOcV43r1nF176v/eBuVPY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1749243059754601.1432576717114; Fri, 6 Jun 2025 13:50:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uNe19-0000jI-KE; Fri, 06 Jun 2025 16:50:23 -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 1uNe17-0000iE-4G for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uNe15-0006ot-8y for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:20 -0400 Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-QT5haPuSPUqYqEjskRxkCg-1; Fri, 06 Jun 2025 16:50:15 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4141E19560B5; Fri, 6 Jun 2025 20:50:14 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2725B30001B7; Fri, 6 Jun 2025 20:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749243018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E6EjVPsLrNhvnNwp1UJ0tdgE37dKoZfSM4H2nVcEoEg=; b=hCcyD3AhNM+mZgdH4mwXmLsJQmLJwdeQb7o+B3EBXH1IoIhIKU73QZJNF9YgWKJkEfnidX fibL6JWKHHfHMvIw5nx64XeRlINR+Xsec80bLOW6Zocfi9B+F5mzr3TMRHYmTOQxsRjZm2 tEvUC/p/O+njRdrxxfsq0cM6QuleYWM= X-MC-Unique: QT5haPuSPUqYqEjskRxkCg-1 X-Mimecast-MFC-AGG-ID: QT5haPuSPUqYqEjskRxkCg_1749243014 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , Peter Maydell , Akihiko Odaki , Cleber Rosa , Markus Armbruster Subject: [PATCH 2/4] docs: Bump sphinx to 6.2.1 Date: Fri, 6 Jun 2025 16:50:07 -0400 Message-ID: <20250606205009.584615-3-jsnow@redhat.com> In-Reply-To: <20250606205009.584615-1-jsnow@redhat.com> References: <20250606205009.584615-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.104, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1749243062934116600 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki sphinx 5.3.0 fails with Python 3.13.1: ../docs/meson.build:37: WARNING: /home/me/qemu/build/pyvenv/bin/sphinx-buil= d: Extension error: Could not import extension sphinx.builders.epub3 (exception: No module name= d 'imghdr') ../docs/meson.build:39:6: ERROR: Problem encountered: Install a Python 3 ve= rsion of python-sphinx and the readthedoc theme Bump sphinx to 6.2.1 and also sphinx_rtd_theme as required for the new sphinx version. (jsnow note: this patch bumps the recommended version for Sphinx to install when it is missing, but allows old versions to be used if they are present and functional. The version used for building docs on readthedocs is pinned to the recommended version, 6.2.1.) Signed-off-by: Akihiko Odaki Tested-by: Markus Armbruster Reviewed-by: John Snow Signed-off-by: John Snow --- docs/requirements.txt | 4 ++-- pythondeps.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 02583f209aa..87f7afcb2e7 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,5 +1,5 @@ # Used by readthedocs.io # Should be in sync with the "installed" key of pythondeps.toml =20 -sphinx=3D=3D5.3.0 -sphinx_rtd_theme=3D=3D1.1.1 +sphinx=3D=3D6.2.1 +sphinx_rtd_theme=3D=3D1.2.2 diff --git a/pythondeps.toml b/pythondeps.toml index 7884ab521d1..b2eec940ce5 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -24,8 +24,8 @@ pycotap =3D { accepted =3D ">=3D1.1.0", installed =3D "1.= 3.1" } =20 [docs] # Please keep the installed versions in sync with docs/requirements.txt -sphinx =3D { accepted =3D ">=3D3.4.3", installed =3D "5.3.0", canary =3D "= sphinx-build" } -sphinx_rtd_theme =3D { accepted =3D ">=3D0.5", installed =3D "1.1.1" } +sphinx =3D { accepted =3D ">=3D3.4.3", installed =3D "6.2.1", canary =3D "= sphinx-build" } +sphinx_rtd_theme =3D { accepted =3D ">=3D0.5", installed =3D "1.2.2" } =20 [testdeps] qemu.qmp =3D { accepted =3D ">=3D0.0.3", installed =3D "0.0.3" } --=20 2.48.1 From nobody Sat Nov 15 17:17:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1749243080; cv=none; d=zohomail.com; s=zohoarc; b=QufHM0tiFdBf0rabsuGQMJ6W7WJ0f0gZvokjKR7lKoocTUuDUSebFWLXJ/EkyP5a+lbDDbxK94JWkJ95bIaSZTUPXZFV7lCDrGHWFsW3XwU18+R47tXqfKYqv8IWwyDNEeN7fcot8WZ0N83ffhIMXRJHfg4lEuY+BaH8HCkNsSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749243080; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=dSguTgBSPR6ROfC7yX2ZNMo78QDUxivVtG9kGgRWWnU=; b=bXA90gtD45hA4/z2Xn/6mfLJiYfnvN7SohPtg4eKcpCNkv0BUFdduvNjvU+RfHCoYycUFAZ7/q6bAJg07XX/1fVlD6FcxsyfrmNqQ/dTqSeoQovz3bvqzgPsUpdZ7OCFaoecEz0ZDBy20ptlFOAsUucZjfqW7VxU3lNR1zBTDb4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1749243080447326.8966372872683; Fri, 6 Jun 2025 13:51:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uNe1D-0000k0-Rm; Fri, 06 Jun 2025 16:50:27 -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 1uNe1A-0000jM-7p for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uNe18-0006pd-2O for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:24 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-262-W8LH4vwdMkiwZmqz3dwSxw-1; Fri, 06 Jun 2025 16:50:17 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 921B41956048; Fri, 6 Jun 2025 20:50:15 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7F5E530001B7; Fri, 6 Jun 2025 20:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749243021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dSguTgBSPR6ROfC7yX2ZNMo78QDUxivVtG9kGgRWWnU=; b=XMjFJGyif2tIvRFGi9BuQbH1HdGg70swHBQBw7865DRVjoxz0hbuhRPjXZNCKUXBH43h5f EPtW1MKy8RUDNfiU36mjoOqU3f8OCaYbUDzjy9tudfs6/RrAl+WpQXBbtz8ot6s+Gr0ScG 1GH8K01YvVi/44Q5ODevjm2xW4EZqus= X-MC-Unique: W8LH4vwdMkiwZmqz3dwSxw-1 X-Mimecast-MFC-AGG-ID: W8LH4vwdMkiwZmqz3dwSxw_1749243016 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , Peter Maydell , Akihiko Odaki , Cleber Rosa Subject: [PATCH 3/4] docs: Require sphinx>=6.2 Date: Fri, 6 Jun 2025 16:50:08 -0400 Message-ID: <20250606205009.584615-4-jsnow@redhat.com> In-Reply-To: <20250606205009.584615-1-jsnow@redhat.com> References: <20250606205009.584615-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.104, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1749243081116116600 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki This makes docs/sphinx/compat.py unnecessary. The accepted range of the sphinx_rtd_theme version was also changed to >=3D1.2.1 for compatibility with sphinx>=3D6.2. Signed-off-by: Akihiko Odaki [Minor edits for rebase and CI verdancy. --js] Signed-off-by: John Snow Tested-by: Markus Armbruster --- docs/sphinx/compat.py | 230 ------------------------------------- docs/sphinx/qapi_domain.py | 38 +++--- python/tests/qapi-isort.sh | 4 +- pythondeps.toml | 4 +- 4 files changed, 21 insertions(+), 255 deletions(-) delete mode 100644 docs/sphinx/compat.py diff --git a/docs/sphinx/compat.py b/docs/sphinx/compat.py deleted file mode 100644 index 9cf7fe006e4..00000000000 --- a/docs/sphinx/compat.py +++ /dev/null @@ -1,230 +0,0 @@ -""" -Sphinx cross-version compatibility goop -""" - -import re -from typing import ( - TYPE_CHECKING, - Any, - Callable, - Optional, - Type, -) - -from docutils import nodes -from docutils.nodes import Element, Node, Text -from docutils.statemachine import StringList - -import sphinx -from sphinx import addnodes, util -from sphinx.directives import ObjectDescription -from sphinx.environment import BuildEnvironment -from sphinx.roles import XRefRole -from sphinx.util import docfields -from sphinx.util.docutils import ( - ReferenceRole, - SphinxDirective, - switch_source_input, -) -from sphinx.util.typing import TextlikeNode - - -MAKE_XREF_WORKAROUND =3D sphinx.version_info[:3] < (4, 1, 0) - - -SpaceNode: Callable[[str], Node] -KeywordNode: Callable[[str, str], Node] - -if sphinx.version_info[:3] >=3D (4, 0, 0): - SpaceNode =3D addnodes.desc_sig_space - KeywordNode =3D addnodes.desc_sig_keyword -else: - SpaceNode =3D Text - KeywordNode =3D addnodes.desc_annotation - - -def nested_parse_with_titles( - directive: SphinxDirective, content_node: Element -) -> None: - """ - This helper preserves error parsing context across sphinx versions. - """ - - # necessary so that the child nodes get the right source/line set - content_node.document =3D directive.state.document - - try: - # Modern sphinx (6.2.0+) supports proper offsetting for - # nested parse error context management - util.nodes.nested_parse_with_titles( - directive.state, - directive.content, - content_node, - content_offset=3Ddirective.content_offset, - ) - except TypeError: - # No content_offset argument. Fall back to SSI method. - with switch_source_input(directive.state, directive.content): - util.nodes.nested_parse_with_titles( - directive.state, directive.content, content_node - ) - - -# ########################################### -# xref compatibility hacks for Sphinx < 4.1 # -# ########################################### - -# When we require >=3D Sphinx 4.1, the following function and the -# subsequent 3 compatibility classes can be removed. Anywhere in -# qapi_domain that uses one of these Compat* types can be switched to -# using the garden-variety lib-provided classes with no trickery. - - -def _compat_make_xref( # pylint: disable=3Dunused-argument - self: sphinx.util.docfields.Field, - rolename: str, - domain: str, - target: str, - innernode: Type[TextlikeNode] =3D addnodes.literal_emphasis, - contnode: Optional[Node] =3D None, - env: Optional[BuildEnvironment] =3D None, - inliner: Any =3D None, - location: Any =3D None, -) -> Node: - """ - Compatibility workaround for Sphinx versions prior to 4.1.0. - - Older sphinx versions do not use the domain's XRefRole for parsing - and formatting cross-references, so we need to perform this magick - ourselves to avoid needing to write the parser/formatter in two - separate places. - - This workaround isn't brick-for-brick compatible with modern Sphinx - versions, because we do not have access to the parent directive's - state during this parsing like we do in more modern versions. - - It's no worse than what pre-Sphinx 4.1.0 does, so... oh well! - """ - - # Yes, this function is gross. Pre-4.1 support is a miracle. - # pylint: disable=3Dtoo-many-locals - - assert env - # Note: Sphinx's own code ignores the type warning here, too. - if not rolename: - return contnode or innernode(target, target) # type: ignore[call-= arg] - - # Get the role instance, but don't *execute it* - we lack the - # correct state to do so. Instead, we'll just use its public - # methods to do our reference formatting, and emulate the rest. - role =3D env.get_domain(domain).roles[rolename] - assert isinstance(role, XRefRole) - - # XRefRole features not supported by this compatibility shim; - # these were not supported in Sphinx 3.x either, so nothing of - # value is really lost. - assert not target.startswith("!") - assert not re.match(ReferenceRole.explicit_title_re, target) - assert not role.lowercase - assert not role.fix_parens - - # Code below based mostly on sphinx.roles.XRefRole; run() and - # create_xref_node() - options =3D { - "refdoc": env.docname, - "refdomain": domain, - "reftype": rolename, - "refexplicit": False, - "refwarn": role.warn_dangling, - } - refnode =3D role.nodeclass(target, **options) - title, target =3D role.process_link(env, refnode, False, target, targe= t) - refnode["reftarget"] =3D target - classes =3D ["xref", domain, f"{domain}-{rolename}"] - refnode +=3D role.innernodeclass(target, title, classes=3Dclasses) - - # This is the very gross part of the hack. Normally, - # result_nodes takes a document object to which we would pass - # self.inliner.document. Prior to Sphinx 4.1, we don't *have* an - # inliner to pass, so we have nothing to pass here. However, the - # actual implementation of role.result_nodes in this case - # doesn't actually use that argument, so this winds up being - # ... fine. Rest easy at night knowing this code only runs under - # old versions of Sphinx, so at least it won't change in the - # future on us and lead to surprising new failures. - # Gross, I know. - result_nodes, _messages =3D role.result_nodes( - None, # type: ignore - env, - refnode, - is_ref=3DTrue, - ) - return nodes.inline(target, "", *result_nodes) - - -class CompatField(docfields.Field): - if MAKE_XREF_WORKAROUND: - make_xref =3D _compat_make_xref - - -class CompatGroupedField(docfields.GroupedField): - if MAKE_XREF_WORKAROUND: - make_xref =3D _compat_make_xref - - -class CompatTypedField(docfields.TypedField): - if MAKE_XREF_WORKAROUND: - make_xref =3D _compat_make_xref - - -# ################################################################ -# Nested parsing error location fix for Sphinx 5.3.0 < x < 6.2.0 # -# ################################################################ - -# When we require Sphinx 4.x, the TYPE_CHECKING hack where we avoid -# subscripting ObjectDescription at runtime can be removed in favor of -# just always subscripting the class. - -# When we require Sphinx > 6.2.0, the rest of this compatibility hack -# can be dropped and QAPIObject can just inherit directly from -# ObjectDescription[Signature]. - -SOURCE_LOCATION_FIX =3D (5, 3, 0) <=3D sphinx.version_info[:3] < (6, 2, 0) - -Signature =3D str - - -if TYPE_CHECKING: - _BaseClass =3D ObjectDescription[Signature] -else: - _BaseClass =3D ObjectDescription - - -class ParserFix(_BaseClass): - - _temp_content: StringList - _temp_offset: int - _temp_node: Optional[addnodes.desc_content] - - def before_content(self) -> None: - # Work around a sphinx bug and parse the content ourselves. - self._temp_content =3D self.content - self._temp_offset =3D self.content_offset - self._temp_node =3D None - - if SOURCE_LOCATION_FIX: - self._temp_node =3D addnodes.desc_content() - self.state.nested_parse( - self.content, self.content_offset, self._temp_node - ) - # Sphinx will try to parse the content block itself, - # Give it nothingness to parse instead. - self.content =3D StringList() - self.content_offset =3D 0 - - def transform_content(self, content_node: addnodes.desc_content) -> No= ne: - # Sphinx workaround: Inject our parsed content and restore state. - if self._temp_node: - content_node +=3D self._temp_node.children - self.content =3D self._temp_content - self.content_offset =3D self._temp_offset diff --git a/docs/sphinx/qapi_domain.py b/docs/sphinx/qapi_domain.py index ebc46a72c61..1a79a02ecc0 100644 --- a/docs/sphinx/qapi_domain.py +++ b/docs/sphinx/qapi_domain.py @@ -31,19 +31,10 @@ from sphinx.locale import _, __ from sphinx.roles import XRefRole from sphinx.util import logging +from sphinx.util.docfields import Field, GroupedField, TypedField from sphinx.util.docutils import SphinxDirective from sphinx.util.nodes import make_id, make_refnode =20 -from compat import ( - CompatField, - CompatGroupedField, - CompatTypedField, - KeywordNode, - ParserFix, - Signature, - SpaceNode, -) - =20 if TYPE_CHECKING: from typing import ( @@ -63,6 +54,7 @@ from sphinx.util.typing import OptionSpec =20 =20 +Signature =3D str logger =3D logging.getLogger(__name__) =20 =20 @@ -157,7 +149,7 @@ def result_nodes( return results, [] =20 =20 -class QAPIDescription(ParserFix): +class QAPIDescription(ObjectDescription[Signature]): """ Generic QAPI description. =20 @@ -315,7 +307,7 @@ class QAPIObject(QAPIDescription): =20 doc_field_types =3D [ # :feat name: descr - CompatGroupedField( + GroupedField( "feature", label=3D_("Features"), names=3D("feat",), @@ -327,8 +319,8 @@ def get_signature_prefix(self) -> List[nodes.Node]: """Return a prefix to put before the object name in the signature.= """ assert self.objtype return [ - KeywordNode("", self.objtype.title()), - SpaceNode(" "), + addnodes.desc_sig_keyword("", self.objtype.title()), + addnodes.desc_sig_space(" "), ] =20 def get_signature_suffix(self) -> List[nodes.Node]: @@ -337,7 +329,7 @@ def get_signature_suffix(self) -> List[nodes.Node]: =20 if "since" in self.options: ret +=3D [ - SpaceNode(" "), + addnodes.desc_sig_space(" "), addnodes.desc_sig_element( "", f"(Since: {self.options['since']})" ), @@ -470,7 +462,11 @@ def _validate_field(self, field: nodes.field) -> None: ) logger.warning(msg, location=3Dfield) =20 - def transform_content(self, content_node: addnodes.desc_content) -> No= ne: + def transform_content( + self, + # pylint: disable=3Darguments-renamed + content_node: addnodes.desc_content + ) -> None: # This hook runs after before_content and the nested parse, but # before the DocFieldTransformer is executed. super().transform_content(content_node) @@ -485,7 +481,7 @@ def transform_content(self, content_node: addnodes.desc= _content) -> None: self._validate_field(field) =20 =20 -class SpecialTypedField(CompatTypedField): +class SpecialTypedField(TypedField): def make_field(self, *args: Any, **kwargs: Any) -> nodes.field: ret =3D super().make_field(*args, **kwargs) =20 @@ -518,14 +514,14 @@ class QAPICommand(QAPIObject): can_collapse=3DFalse, ), # :error: descr - CompatField( + Field( "error", label=3D_("Errors"), names=3D("error", "errors"), has_arg=3DFalse, ), # :return TypeName: descr - CompatGroupedField( + GroupedField( "returnvalue", label=3D_("Return"), rolename=3D"type", @@ -543,7 +539,7 @@ class QAPIEnum(QAPIObject): doc_field_types.extend( [ # :value name: descr - CompatGroupedField( + GroupedField( "value", label=3D_("Values"), names=3D("value",), @@ -560,7 +556,7 @@ class QAPIAlternate(QAPIObject): doc_field_types.extend( [ # :alt type name: descr - CompatTypedField( + TypedField( "alternative", label=3D_("Alternatives"), names=3D("alt",), diff --git a/python/tests/qapi-isort.sh b/python/tests/qapi-isort.sh index 78dd947f68c..93c02619541 100755 --- a/python/tests/qapi-isort.sh +++ b/python/tests/qapi-isort.sh @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later =20 python3 -m isort --sp . -c ../scripts/qapi/ -# Force isort to recognize "compat" as a local module and not third-party -python3 -m isort --sp . -c -p compat -p qapidoc_legacy \ +# Force isort to recognize "qapidoc_legacy" as a local module +python3 -m isort --sp . -c -p qapidoc_legacy \ ../docs/sphinx/qapi_domain.py \ ../docs/sphinx/qapidoc.py diff --git a/pythondeps.toml b/pythondeps.toml index b2eec940ce5..4a3eab6eee3 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -24,8 +24,8 @@ pycotap =3D { accepted =3D ">=3D1.1.0", installed =3D "1.= 3.1" } =20 [docs] # Please keep the installed versions in sync with docs/requirements.txt -sphinx =3D { accepted =3D ">=3D3.4.3", installed =3D "6.2.1", canary =3D "= sphinx-build" } -sphinx_rtd_theme =3D { accepted =3D ">=3D0.5", installed =3D "1.2.2" } +sphinx =3D { accepted =3D ">=3D6.2.1", installed =3D "6.2.1", canary =3D "= sphinx-build" } +sphinx_rtd_theme =3D { accepted =3D ">=3D1.2.2", installed =3D "1.2.2" } =20 [testdeps] qemu.qmp =3D { accepted =3D ">=3D0.0.3", installed =3D "0.0.3" } --=20 2.48.1 From nobody Sat Nov 15 17:17:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1749243113; cv=none; d=zohomail.com; s=zohoarc; b=M7J+/WOpK2qEX+2ZanxzYRKt1sABFwd4tWhzG4pTNGTEHEp2XyuLUxnTSzU9Cswr0ulbDCcZ5wIdj0iC1Xq98YyC5colKKdeNS829/YsXEBigl0Tg/ESE6YXWfj7ezXlAD0UHaibHSJJfRq2a++XTo9NMbO6RX4ifDb6ULwtmfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1749243113; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=j+MY3ofuSJwG9RaBeMZqHsT09UC35tTtzleQxHkDzsE=; b=UVkDjBbO3xDSNYG9NcXSXiD9t6SibR6iuT2vJ8L8cR0m+UPC7wz6nbYEhi1NAyUqkKhzek7tZkCPdA2/TW51HLhVQx+jKmr56Yca/GZetF0sblkx5mdVq+4Em0IhFWZuW0zvOi3JQnZmbQx6SNRKuWbaBNLxs8dfntyFzla8j2k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1749243113453365.4301532276809; Fri, 6 Jun 2025 13:51:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uNe1A-0000jL-3s; Fri, 06 Jun 2025 16:50: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 1uNe17-0000ic-Va for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uNe16-0006oz-6y for qemu-devel@nongnu.org; Fri, 06 Jun 2025 16:50:21 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-601-MaIb4RPDPV6FwsUTgu090Q-1; Fri, 06 Jun 2025 16:50:17 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F3AE21800361; Fri, 6 Jun 2025 20:50:16 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.64.2]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E7D2230002D1; Fri, 6 Jun 2025 20:50:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749243019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j+MY3ofuSJwG9RaBeMZqHsT09UC35tTtzleQxHkDzsE=; b=K+yF8UDtdBXeTpFeBMN/YQb1vIau8nLbjW1nixQAFSSABsRzb2Vo66dmK1VQxB6wFz95Sy FEOsBZve8q1rxwYoV7+bhl/L3IVaQtEZUU0mCYuoWwm5asAmkl4zL9MgG5roVfDXy/H2V+ pd3GerHITWiarYAf9L/85rpEn4rmUCM= X-MC-Unique: MaIb4RPDPV6FwsUTgu090Q-1 X-Mimecast-MFC-AGG-ID: MaIb4RPDPV6FwsUTgu090Q_1749243017 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , Peter Maydell , Akihiko Odaki , Cleber Rosa Subject: [PATCH 4/4] MAINTAINERS: Add docs/requirements.txt Date: Fri, 6 Jun 2025 16:50:09 -0400 Message-ID: <20250606205009.584615-5-jsnow@redhat.com> In-Reply-To: <20250606205009.584615-1-jsnow@redhat.com> References: <20250606205009.584615-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.104, 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_H5=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: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1749243115190116600 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki Add docs/requirements.txt to "Sphinx documentation configuration and build machinery". Signed-off-by: Akihiko Odaki Signed-off-by: John Snow Tested-by: Markus Armbruster --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index aa6763077ea..76674c88b0e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4379,6 +4379,7 @@ M: Peter Maydell S: Maintained F: docs/conf.py F: docs/*/conf.py +F: docs/requirements.txt F: docs/sphinx/ F: docs/_templates/ F: docs/devel/docs.rst --=20 2.48.1