From nobody Wed Jan 29 00:11:53 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1734052618; cv=none; d=zohomail.com; s=zohoarc; b=NsmZx9GQOsIeHwALO2Qd4DUi3XFka5w+l+a2HZVO6p71aydM0lCYRuJlOL3go4k51S+gWz3C7CTMqp6Sj9U+MHX7HVTtmqyQOQiGPcSuBvtjnW6EiUvdSjECGiZULwYP3BD6HxjAnfBLQGaqRndaZQGIj9LxDKUErQLqbUZHvvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734052618; 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=m002wEHjt34wmmf8tuiB51lCnoVpWPUUxPt3b8N6FbE=; b=gxOZvG4XX7k4470un0f1APDRJLJEv5UHEirIFgPqtSuDzCAhejeHY8oAOW7IJpMmTJ2wXpTPbqv9aM5l+BlCuBfdE6ByuRr4Akgg1DwQanl4We68QlZnS2cZhmBDh7QWcxihXkuYNQsnnSG/M0ZBJXDF1HIpr6NMnmKo1KOU/o8= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1734052618193260.6607473742224; Thu, 12 Dec 2024 17:16:58 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLuG0-0005bN-7w; Thu, 12 Dec 2024 20:14:16 -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 1tLuFy-0005bD-MC for qemu-devel@nongnu.org; Thu, 12 Dec 2024 20:14:14 -0500 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 1tLuFx-0000ax-8l for qemu-devel@nongnu.org; Thu, 12 Dec 2024 20:14:14 -0500 Received: from mx-prod-mc-03.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-614-k3iOu0f4OgCYZAsiHK-FBQ-1; Thu, 12 Dec 2024 20:14:08 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 12B9019560B8; Fri, 13 Dec 2024 01:14:07 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.88.22]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D3C131956086; Fri, 13 Dec 2024 01:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734052452; 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=m002wEHjt34wmmf8tuiB51lCnoVpWPUUxPt3b8N6FbE=; b=dTkfjBvIeXbEWDKYDF0n05VrRk2+tLzZC4zNfmmjjBgyy1h2k9AJ0xDmiUYrYcWpRzSlev CKNdCkOeMptp5wYN+y4T+HC3s0G2R8SqImf52mEa19nbcQsJSoYvxFuf4TZE1bMil0MjpB M7LHjQXFEFIvlOKEo5GgqXLMZYvOolo= X-MC-Unique: k3iOu0f4OgCYZAsiHK-FBQ-1 X-Mimecast-MFC-AGG-ID: k3iOu0f4OgCYZAsiHK-FBQ From: John Snow To: qemu-devel@nongnu.org Cc: Michael Roth , Markus Armbruster , Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Victor Toso de Carvalho , Paolo Bonzini , John Snow Subject: [RFC PATCH v2 12/35] docs/qapi-domain: add :since: directive option Date: Thu, 12 Dec 2024 20:12:41 -0500 Message-ID: <20241213011307.2942030-13-jsnow@redhat.com> In-Reply-To: <20241213011307.2942030-1-jsnow@redhat.com> References: <20241213011307.2942030-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.496, 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_H2=-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: 1734052619459116600 Content-Type: text/plain; charset="utf-8" Add a little special markup for registering "Since:" information. Adding it as an option instead of generic content lets us hoist the information into the Signature bar, optionally put it in the index, etc. Signed-off-by: John Snow --- docs/sphinx/qapi-domain.py | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/docs/sphinx/qapi-domain.py b/docs/sphinx/qapi-domain.py index dd4e218a1a0..f525579661b 100644 --- a/docs/sphinx/qapi-domain.py +++ b/docs/sphinx/qapi-domain.py @@ -4,6 +4,7 @@ =20 from __future__ import annotations =20 +import re from typing import ( TYPE_CHECKING, Any, @@ -83,6 +84,18 @@ def process_link( return title, target =20 =20 +def since_validator(param: str) -> str: + """ + Validate the `:since: X.Y` option field. + """ + match =3D re.match(r"[0-9]+\.[0-9]+", param) + if not match: + raise ValueError( + f":since: requires a version number in X.Y format; not {param!= r}" + ) + return param + + # Alias for the return of handle_signature(), which is used in several pla= ces. # (In the Python domain, this is Tuple[str, str] instead.) Signature =3D str @@ -103,6 +116,8 @@ class QAPIObject(ObjectDescription[Signature]): { # Borrowed from the Python domain: "module": directives.unchanged, # Override contextual module = name + # These are QAPI originals: + "since": since_validator, } ) =20 @@ -114,9 +129,19 @@ def get_signature_prefix(self, sig: str) -> List[nodes= .Node]: space_node(" "), ] =20 - def get_signature_suffix(self, sig: str) -> list[nodes.Node]: + def get_signature_suffix(self, sig: str) -> List[nodes.Node]: """Returns a suffix to put after the object name in the signature.= """ - return [] + ret: List[nodes.Node] =3D [] + + if "since" in self.options: + ret +=3D [ + space_node(" "), + addnodes.desc_sig_element( + "", f"(Since: {self.options['since']})" + ), + ] + + return ret =20 def handle_signature(self, sig: str, signode: desc_signature) -> Signa= ture: """ --=20 2.47.0