From nobody Sat Sep 26 23:03:38 2026 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=1787634970; cv=none; d=zohomail.com; s=zohoarc; b=hnDngdwB+3HwalN1ZH+k0Z1TZ5g4JZWnCLrl//KGtgev/c6LSOjA2oHfXrJJrA/v5rd9VCiXU0E7+enkWAGnzvVrbewtaMhiV2RghVh6FjuDb/n6tK/LzgS3tCN8OguHVc46+PJWjvl2BFmfbaqjjvw1vy6PoFhthzDc0t/Qr8E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634970; 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=T0JHv7E9VEa1CoWElLu61Kg5YV6XXUCoM9UelguJ/rM=; b=ZYMWR0I+PsviRvGZbP4PmmdaWzbUwUdyxrxH4TpraaqnDWgHIYJfucF5MkMDLPVHs/jYxm+HYfyRLvraS3bfjATAINIAJ9BJdeL+E9qQUdd3GH5//FvPo+Mf9ofWiBdK8zdL31KeJaE7k/GDAvWoy52o0mLLk/93oBvrC59bt2M= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634970532585.4674251812987; Mon, 24 Aug 2026 22:16:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjV4-0002LX-3d; Tue, 25 Aug 2026 01:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjV2-0002L6-2q for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:04 -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 1wyjV0-0004ar-Nt for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:03 -0400 Received: from mx-prod-mc-01.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-41-CkPaiBaLOSmhh9yr8pm1SA-1; Tue, 25 Aug 2026 01:14:54 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C9050195411B; Tue, 25 Aug 2026 05:14:52 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DD0201955F1E; Tue, 25 Aug 2026 05:14:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634901; 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=T0JHv7E9VEa1CoWElLu61Kg5YV6XXUCoM9UelguJ/rM=; b=XmLpbwxAJCekzpqhL+oL1bjkc3uCSPyT6/ysebczMU5Xp+6/5hN1X3IgWfzw+H23R5Gbkh Ga8lPBfiIVELeQbqCR/S9OH558yww0peale3pTR7kM74/Wh9+xwcnRbmovQzVf21nGkhYr N+S1Aj0QwD32unMxs+OtH2s2yLHXcc8= X-MC-Unique: CkPaiBaLOSmhh9yr8pm1SA-1 X-Mimecast-MFC-AGG-ID: CkPaiBaLOSmhh9yr8pm1SA_1787634893 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 01/16] tests: update vm tests to prefer locally-built QEMU Date: Tue, 25 Aug 2026 01:14:26 -0400 Message-ID: <20260825051441.1562454-2-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787634972807158500 Content-Type: text/plain; charset="utf-8" In 05e4982, we updated our QMP tests to prefer `-object monitor-qmp`, but this requires a sufficiently recent and modern version of QEMU to run correctly. Update the "make vm-run-xxx" targets to use the runscript that will naturally prefer the locally built version of QEMU so that these tests launch successfully once more. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/vm/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 0a53dc9fdd6..0ec1b47e63e 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -5,7 +5,7 @@ ifeq ($(realpath $(SRC_PATH)),$(realpath .)) VM_PYTHON =3D $(SRC_PATH)/vm-venv/bin/python3 VM_VENV =3D vm-venv else -VM_PYTHON =3D $(PYTHON) +VM_PYTHON =3D $(BUILD_DIR)/run $(PYTHON) VM_VENV =3D endif =20 --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634975; cv=none; d=zohomail.com; s=zohoarc; b=nPKWkKkNLTgB98hF9Ef3nvp4J2Qz5WpHpG0IuYEnbK6jG5Njxxcxgirm4c/MEMPsgiPtYRDdpX3pwOJrf7BhDLNXpA5sYGpgk+U3o88O/Wk73VN4AQMCVciG0CKVSzUsdDa2uyIiYh95AqDi6hEfgLQe9K2J19tzsSdMPlQhfy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634975; 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=BZZI4Q6V28Uy048tgQvzEvLiY7Zjt5o3fwG+Seo3N9U=; b=mVFkZdMGVlGoP3Wlqnb7IJbkgCYoxaqJtmwPn/e6K2sweev4Fi7ewIZ0K9V6kjaDOrY10auxFDF1bl7QAwM2450XFwhommAzMGODXr15mL9syDXnNK7jZFj4szACpfbkU0ESTBpWxXLLNj8D6hSbFqRvgL0ucTo8C3uxzpSlcrY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634975840793.7507178458321; Mon, 24 Aug 2026 22:16:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjV7-0002Lw-Hx; Tue, 25 Aug 2026 01:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjV6-0002Li-IR for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:08 -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 1wyjV5-0004ml-3p for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:08 -0400 Received: from mx-prod-mc-01.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-582-9C6aNDoyMv-MThyMWsbvOw-1; Tue, 25 Aug 2026 01:14:59 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 69A2C1953994; Tue, 25 Aug 2026 05:14:57 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 30F5D1955F76; Tue, 25 Aug 2026 05:14:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634906; 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=BZZI4Q6V28Uy048tgQvzEvLiY7Zjt5o3fwG+Seo3N9U=; b=GTGyelH5jaqlm3XJAnW9zW6zsWb91RjR4lAK+FCZE0stN8U6140p+pfPHhGufB3KCBJ9aV Bo9NDXqtTyHuqbhTTOMSCQGDwHKMMiW7FE61sUr8eGj1gp4HcViJAemewtlQV/3kOA9gb0 DjrGjuTcpnQKpbP8POR047ZdGb8hhGk= X-MC-Unique: 9C6aNDoyMv-MThyMWsbvOw-1 X-Mimecast-MFC-AGG-ID: 9C6aNDoyMv-MThyMWsbvOw_1787634898 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 02/16] tests: update FreeBSD dependencies Date: Tue, 25 Aug 2026 01:14:27 -0400 Message-ID: <20260825051441.1562454-3-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787634976688158500 Content-Type: text/plain; charset="utf-8" FreeBSD has dropped Python3.11, now defaulting to Python3.12+; upgrade the names of the various dependencies to match. Signed-off-by: John Snow --- tests/lcitool/mappings.yml | 9 +++++++++ tests/vm/generated/freebsd.json | 12 ++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 1816556dde4..afe52455235 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -11,21 +11,29 @@ mappings: =20 python3-pip: CentOSStream9: python3.11-pip + FreeBSD: py312-pip =20 python3-setuptools: CentOSStream9: python3.11-setuptools + FreeBSD: py312-setuptools =20 python3-sphinx: CentOSStream9: + FreeBSD: py312-sphinx =20 python3-sphinx-rtd-theme: CentOSStream9: + FreeBSD: py312-sphinx_rtd_theme =20 python3-venv: CentOSStream9: python3.11 =20 python3-wheel: CentOSStream9: python3.11-wheel + FreeBSD: py312-wheel + + python3-numpy: + FreeBSD: py312-numpy =20 meson: # Use Meson from PyPI wherever Rust is enabled @@ -38,6 +46,7 @@ mappings: apk: Fedora: Debian12: + FreeBSD: py312-tomli =20 rust: Debian12: rustc-web diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.j= son index dfa8b41a524..ee3402f0d2b 100644 --- a/tests/vm/generated/freebsd.json +++ b/tests/vm/generated/freebsd.json @@ -52,12 +52,12 @@ "pixman", "pkgconf", "png", - "py311-pip", - "py311-setuptools", - "py311-sphinx", - "py311-sphinx_rtd_theme", - "py311-tomli", - "py311-wheel", + "py312-pip", + "py312-setuptools", + "py312-sphinx", + "py312-sphinx_rtd_theme", + "py312-tomli", + "py312-wheel", "python3", "rpm2cpio", "rust", --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634995; cv=none; d=zohomail.com; s=zohoarc; b=lnESMotdvOD6VoieYOLxqVOeFwChvrrbDT/2PaCG0mPotLnTFhWRvx37s7xH5aTgLr+ULt+VOAjSZVRJk1LAv7Kr+Ut21SxxrPSh7O9keD5TnNArS3Op3/DQu9L8VQSnM3evIiWTTeWb6+NGEAaVNC1jZWYeDYihp7v43PlalvQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634995; 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=ByCmjGzI0UkOk5F3VWiqKMsURJ4FVXKZKTw0LBedcPE=; b=NeDxjfcIjY4AOv/ITcy3wSWJ+8U2VpGgC3FckVyCXSqWr/LskP/hJuCi8+W/fusjM7hKkai3JNZu0ArzT1Se4zB5prIND1+0CDLLo60SaZ+K8w+wYGXUyTm8j9pFR2d3fNmLQOtGKdlZQauwDxHGlqhIHQdlKZIXdPiERIH7nUU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178763499517772.58642523267883; Mon, 24 Aug 2026 22:16:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVK-0002XK-VE; Tue, 25 Aug 2026 01:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVJ-0002X1-D8 for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15: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 1wyjVH-0004oP-RG for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15: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-443-xE0K-LCjP8yDgcXEuB_E-w-1; Tue, 25 Aug 2026 01:15:03 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 670B118600C6; Tue, 25 Aug 2026 05:15:01 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E05301955F1E; Tue, 25 Aug 2026 05:14:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634919; 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=ByCmjGzI0UkOk5F3VWiqKMsURJ4FVXKZKTw0LBedcPE=; b=b/cR/vgIs74HGDVdcHMCQfyzddgbzekQPq4OU6E6cbBX75Cm8nCbNnufCF+VHD0q3svRmn z3IB++iaDkg1U6NU5cwRb7Wj5iHFAA+wn99qq1KQgpD+pBihtjjFN9p6R/7096cwJ/VyO0 7JdBqCJ/f2NbSFKmcilhJa9rQmXOe94= X-MC-Unique: xE0K-LCjP8yDgcXEuB_E-w-1 X-Mimecast-MFC-AGG-ID: xE0K-LCjP8yDgcXEuB_E-w_1787634902 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 03/16] tests: update netbsd dependencies Date: Tue, 25 Aug 2026 01:14:28 -0400 Message-ID: <20260825051441.1562454-4-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787634996693158500 Content-Type: text/plain; charset="utf-8" NetBSD appears to need 'bison' explicitly installed now. I am still seeing some intermittant failures in the tests for ide-test and qos-test, but those are mysteries for another day. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- tests/vm/netbsd | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index b365045066c..45afe675e17 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -39,6 +39,7 @@ class NetBSDVM(basevm.BaseVM): "gmake", "gsed", "gettext-tools", + "bison", =20 # libs: basic "dtc", --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634952; cv=none; d=zohomail.com; s=zohoarc; b=Ba/89EoZfm6MaQFM2+9GpwvxmY5EHgjtg/tP7A4VNU6RHe1VIr7bIxa2vO2YPjtGP0xQFt44+UxUEHGumV9MtM49bHBUQStjwbp2kSQppGCHYfkxrh4AnsJdIYuH+qby0hP0SO+YmiVuqXDejCrnemUn/2jCiq4by+hg047igZ8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634952; 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=kciMs1gcHmzNOYWOv9Hl7ngYbdClYHujXToa4VpSMbM=; b=Tg+O2AsQKJmHe2IwAAaDcoI+MVfd8PA3GF1Avg5bVxjLU2OmeIfPlkMywkTOv7zn4xRYpOUjKfQnNZVjm10Z7Djwfg2s0oegejvaf4dAiAmWRBcxCwfNVeTvGCuZRcN9f1hn6CxSoHETZWWeNqYbmxyqWmaMjrtNvZeFPszIhVA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634952972837.019858330303; Mon, 24 Aug 2026 22:15:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVB-0002NS-RB; Tue, 25 Aug 2026 01:15:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVA-0002Mo-N1 for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:12 -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 1wyjV9-0004nJ-Bs for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:12 -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-618-50LeLXQQNTmeTz15A0BoLg-1; Tue, 25 Aug 2026 01:15:07 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 4451818707BA; Tue, 25 Aug 2026 05:15:05 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0239D1955F76; Tue, 25 Aug 2026 05:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634910; 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=kciMs1gcHmzNOYWOv9Hl7ngYbdClYHujXToa4VpSMbM=; b=LKO7nngBimxBVpbxR5b7PfVKG2drRAf71swdwPk/20r2904AtSOGVu8F9aB+XoKG+8LTKT YkUePsvtXpMC1Othtgb0Zgsjm1HUudU+PrdyMTPreCmwZDJc82aoj2zfznvrHzeH/8+0NY nQfm07eJmfXpyM6aiZLqeJVYByPNjnU= X-MC-Unique: 50LeLXQQNTmeTz15A0BoLg-1 X-Mimecast-MFC-AGG-ID: 50LeLXQQNTmeTz15A0BoLg_1787634905 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 04/16] tests: drop python3-devel mapping Date: Tue, 25 Aug 2026 01:14:29 -0400 Message-ID: <20260825051441.1562454-5-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787634955417158500 Content-Type: text/plain; charset="utf-8" This is not being used, so drop it. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/lcitool/mappings.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index afe52455235..b576ded3edc 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -6,9 +6,6 @@ mappings: python3: CentOSStream9: python3.11 =20 - python3-devel: - CentOSStream9: python3.11-devel - python3-pip: CentOSStream9: python3.11-pip FreeBSD: py312-pip --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787635006; cv=none; d=zohomail.com; s=zohoarc; b=KM3kqg+DV4HnLGafGORNqaH7lbEYZ3cyKfULyF6G1YIkHitGWFBmYzK145PCeD1JLRSEtgS5uaitbMVwt+I+mhSF0vOo2ZSewax9ZwqmLjtYmPBVB8iFew0t9K7nje3IpexfpfmVhsm6RC/Id52g8lUDC/kw995zA45J8KgZghU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787635006; h=Content-Type: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=ivz++OmMM1nhNn0tp4M+8TZYaQWN0wgI9w3XyMs+w4E=; b=LPUtgx/LPkber6zW9c33blLQlNkpUIjMSu5NQ7Yr1WhQZQ42qmdq4yso0r2eb7QhkuQkZa9TqHfr3f4WVoM9M4zOKHvwsaVXjTV7Z2oJ4G67+qHODBaWBIl0YtLmT9sEJCTkOXesvm++TXASfCRPBe8YyGVktH77+TXKnX5SiOw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787635006419951.5604477022262; Mon, 24 Aug 2026 22:16:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVK-0002XJ-Oz; Tue, 25 Aug 2026 01:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVJ-0002X9-Ux for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15: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 1wyjVF-0004o7-Rt for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:21 -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-101-cCozYLLOOzK9-nEMoqBIMg-1; Tue, 25 Aug 2026 01:15:12 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 42C96180AC7F; Tue, 25 Aug 2026 05:15:10 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A65921955F76; Tue, 25 Aug 2026 05:15:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ivz++OmMM1nhNn0tp4M+8TZYaQWN0wgI9w3XyMs+w4E=; b=bm071jBapVoEWQa0SYQwdyxbKa/WnGkzHDqu3qzQsDfB5lty/BDoNRajqoSBTqezcbOZsG rU3UfD+qmSfeZhMTwmpeSqvMM6e9VB5g3iq7PgvUJAG4iUOxvjduXeSsq2y/d4j5JWtmxx lrmGh+xGzXntlfgMHn4HncNkHkc0xos= X-MC-Unique: cCozYLLOOzK9-nEMoqBIMg-1 X-Mimecast-MFC-AGG-ID: cCozYLLOOzK9-nEMoqBIMg_1787634911 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 05/16] tests: re-add opencv2 and numpy dependencies Date: Tue, 25 Aug 2026 01:14:30 -0400 Message-ID: <20260825051441.1562454-6-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787635006846158500 Fixes: 2a428c8541ec5e9be54aad5f0a446ec8172226c9 Some of the dependencies identified as avocado dependencies were in fact still being used, and should be re-added to our lcitool configuration to ensure that these tests are being executed in the CI environment. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/centos9.docker | 2 ++ tests/docker/dockerfiles/debian-amd64-cross.docker | 2 ++ tests/docker/dockerfiles/debian-arm64-cross.docker | 2 ++ tests/docker/dockerfiles/debian-armhf-cross.docker | 2 ++ tests/docker/dockerfiles/debian-i686-cross.docker | 2 ++ tests/docker/dockerfiles/debian-ppc64el-cross.docker | 2 ++ tests/docker/dockerfiles/debian-riscv64-cross.docker | 2 ++ tests/docker/dockerfiles/debian-s390x-cross.docker | 2 ++ tests/docker/dockerfiles/debian.docker | 2 ++ tests/docker/dockerfiles/fedora-rust-nightly.docker | 2 ++ tests/docker/dockerfiles/fedora-win64-cross.docker | 2 ++ tests/docker/dockerfiles/fedora.docker | 2 ++ tests/docker/dockerfiles/opensuse-leap.docker | 2 ++ tests/docker/dockerfiles/ubuntu2404.docker | 2 ++ .gitlab-ci.d/macos-14.vars | 2 +- scripts/ci/setup/debian/debian-13-ppc64le.yaml | 2 ++ scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml | 2 ++ scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml | 2 ++ tests/lcitool/mappings.yml | 10 ++++++++++ tests/lcitool/projects/qemu.yml | 2 ++ tests/vm/generated/freebsd.json | 2 ++ 22 files changed, 50 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index 8a5a355e89a..7c342e801c5 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -83,6 +83,7 @@ RUN apk update && \ pixman-dev \ pkgconf \ pulseaudio-dev \ + py3-numpy \ py3-pip \ py3-setuptools \ py3-sphinx \ diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerf= iles/centos9.docker index 8101370a2db..6f5c400c2db 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -130,6 +130,8 @@ RUN dnf --quiet distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN /usr/bin/pip3.11 install \ + numpy \ + opencv-python \ sphinx \ sphinx-rtd-theme =20 diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index 9e30457ca79..9b446a480b1 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index b9b94e5e6fa..95c757edb7c 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index aa412ff66f5..0c6287408ac 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index d07eac84fe8..99447e2e79b 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 7302c8236e4..534c9b55836 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/d= ocker/dockerfiles/debian-riscv64-cross.docker index aa5a881cab2..0df92c80c05 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index 82eae4fc2c2..12c94a40ec7 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -41,6 +41,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfi= les/debian.docker index 3a4f208ccf6..d808c945f46 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -113,6 +113,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/do= cker/dockerfiles/fedora-rust-nightly.docker index 0f3dc370a4f..0f7b4c13388 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -104,6 +104,8 @@ exec "$@"\n' > /usr/bin/nosync && \ pkgconfig \ pulseaudio-libs-devel \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 6f972f61738..3ed3e15df33 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -44,6 +44,8 @@ exec "$@"\n' > /usr/bin/nosync && \ ninja-build \ openssh-clients \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 99bb38a3665..8fa8bea1abf 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -104,6 +104,8 @@ exec "$@"\n' > /usr/bin/nosync && \ pkgconfig \ pulseaudio-libs-devel \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 8d8631bbcf0..3174c2e3cc2 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -95,6 +95,8 @@ RUN zypper update -y && \ pkgconfig \ python3-Sphinx \ python3-base \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx_rtd_theme \ diff --git a/tests/docker/dockerfiles/ubuntu2404.docker b/tests/docker/dock= erfiles/ubuntu2404.docker index a5c22231f98..0918622e53d 100644 --- a/tests/docker/dockerfiles/ubuntu2404.docker +++ b/tests/docker/dockerfiles/ubuntu2404.docker @@ -113,6 +113,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ openssh-client \ pkgconf \ python3 \ + python3-numpy \ + python3-opencv \ python3-pip \ python3-setuptools \ python3-sphinx \ diff --git a/.gitlab-ci.d/macos-14.vars b/.gitlab-ci.d/macos-14.vars index 0c187624dd0..f96e173f663 100644 --- a/.gitlab-ci.d/macos-14.vars +++ b/.gitlab-ci.d/macos-14.vars @@ -12,5 +12,5 @@ NINJA=3D'/opt/homebrew/bin/ninja' PACKAGING_COMMAND=3D'brew' PIP3=3D'/opt/homebrew/bin/pip3' PKGS=3D'bash bc bindgen bison bzip2 capstone ccache cmocka coreutils ctags= curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 g= tk-vnc jemalloc jpeg-turbo json-c libcbor libepoxy libffi libgcrypt libiscs= i libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson mtools = ncurses nettle ninja pixman pkg-config python-setuptools python3 rpm2cpio r= ust sdl2 sdl2_image snappy socat sparse spice-protocol swtpm tesseract usbr= edir vde vte3 vulkan-tools xorriso zlib zstd' -PYPI_PKGS=3D'sphinx sphinx-rtd-theme tomli' +PYPI_PKGS=3D'numpy sphinx sphinx-rtd-theme tomli' PYTHON=3D'/opt/homebrew/bin/python3' diff --git a/scripts/ci/setup/debian/debian-13-ppc64le.yaml b/scripts/ci/se= tup/debian/debian-13-ppc64le.yaml index 9acd99a7433..918deeb6ad7 100644 --- a/scripts/ci/setup/debian/debian-13-ppc64le.yaml +++ b/scripts/ci/setup/debian/debian-13-ppc64le.yaml @@ -105,6 +105,8 @@ packages: - openssh-client - pkgconf - python3 + - python3-numpy + - python3-opencv - python3-pip - python3-setuptools - python3-sphinx diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml b/scripts/ci/= setup/ubuntu/ubuntu-2404-aarch64.yaml index 5c948109df8..38da57519d6 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml @@ -106,6 +106,8 @@ packages: - openssh-client - pkgconf - python3 + - python3-numpy + - python3-opencv - python3-pip - python3-setuptools - python3-sphinx diff --git a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml b/scripts/ci/se= tup/ubuntu/ubuntu-2404-s390x.yaml index 010b7f86aab..bae71c1cbc6 100644 --- a/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml +++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml @@ -104,6 +104,8 @@ packages: - openssh-client - pkgconf - python3 + - python3-numpy + - python3-opencv - python3-pip - python3-setuptools - python3-sphinx diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index b576ded3edc..9bc87b4879f 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -22,6 +22,9 @@ mappings: CentOSStream9: FreeBSD: py312-sphinx_rtd_theme =20 + python3-opencv: + CentOSStream9: + python3-venv: CentOSStream9: python3.11 =20 @@ -30,6 +33,7 @@ mappings: FreeBSD: py312-wheel =20 python3-numpy: + CentOSStream9: FreeBSD: py312-numpy =20 meson: @@ -60,3 +64,9 @@ pypi_mappings: apk: Fedora: Debian12: + + python3-numpy: + CentOSStream9: numpy + + python3-opencv: + CentOSStream9: opencv-python diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index b3c99936723..abbd3e3f0b8 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -91,6 +91,8 @@ packages: - pkg-config - pulseaudio - python3 + - python3-numpy + - python3-opencv - python3-pip - python3-setuptools - python3-sphinx diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.j= son index ee3402f0d2b..c35591b39d6 100644 --- a/tests/vm/generated/freebsd.json +++ b/tests/vm/generated/freebsd.json @@ -49,9 +49,11 @@ "ncurses", "nettle", "ninja", + "opencv", "pixman", "pkgconf", "png", + "py312-numpy", "py312-pip", "py312-setuptools", "py312-sphinx", --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634990; cv=none; d=zohomail.com; s=zohoarc; b=V7iBmHb00+3oUZM/eteRB1vHHhR16DK6l7IFzC9gnd5krqY6DfhjByuhdfdpNDnL6yIt8KGBht/Df6vjFB6I1tqssmAf5/29o6BagfdV3xZVe5/yQGA4I5ydA3WsQz/Sxdyh1p19z+184QiYxHz6NiPenwWZX7uToUwpF8x7pgU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634990; 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=IqLeDQgg+F04az8MfS6Ju+B0bRpISSW4bSKrQWaAi6k=; b=Pe4hWlMO4QPhXald2Pc02b8Fw7xciz5DS/v5q7bGa8WEuds1UoQ7bHud+WCnO7zUnsLecxuVdXR44/vx1PR+9IiHoaK7aH3FbqkbRSzY3Zam0LluCRwAhDpUshHwAu/IesfQaPEo2e2TjYoFCSm0qXmCMVJVS4LIef31ik9IwPA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634990710457.94086268495926; Mon, 24 Aug 2026 22:16:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVO-0002aD-Jw; Tue, 25 Aug 2026 01:15:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVN-0002Xy-0c for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15: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 1wyjVL-0004p3-Hc for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:24 -0400 Received: from mx-prod-mc-01.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-186-p6a0JozkPYWCaGzTK01l4A-1; Tue, 25 Aug 2026 01:15:17 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4CD3C1953994; Tue, 25 Aug 2026 05:15:14 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9A0321955F1E; Tue, 25 Aug 2026 05:15:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634922; 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=IqLeDQgg+F04az8MfS6Ju+B0bRpISSW4bSKrQWaAi6k=; b=dsSiZPJQBING+eki+tR8OoE1PdG13nB5CofUb9NqoDz36V1ZTfxT6cORl2IYQ/OWv+Y9kU 8kNzhvSB4xtdGp5l974ggvngEZrPLolxcgWLQOptOnlEgfZ3xKg1KxFr3LsahRI7HLNiCb j4K/ZrH83GiTmoIimhQVX3En2MnmqtM= X-MC-Unique: p6a0JozkPYWCaGzTK01l4A-1 X-Mimecast-MFC-AGG-ID: p6a0JozkPYWCaGzTK01l4A_1787634914 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 06/16] tests: add Python3.12 to centos9.docker Date: Tue, 25 Aug 2026 01:14:31 -0400 Message-ID: <20260825051441.1562454-7-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787634993144158500 Content-Type: text/plain; charset="utf-8" While we recently upgraded to Python 3.11 for the CentOS 9 container, upgrade it even further to Python 3.12. Signed-off-by: John Snow Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/docker/dockerfiles/centos9.docker | 12 ++++++------ tests/lcitool/mappings.yml | 10 +++++----- tests/lcitool/targets/centos-stream-9.yml | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerf= iles/centos9.docker index 6f5c400c2db..8bfce395f9d 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -96,10 +96,10 @@ RUN dnf --quiet distro-sync -y && \ pkgconfig \ pulseaudio-libs-devel \ python3-tomli \ - python3.11 \ - python3.11-pip \ - python3.11-setuptools \ - python3.11-wheel \ + python3.12 \ + python3.12-pip \ + python3.12-setuptools \ + python3.12-wheel \ rdma-core-devel \ rust \ rust-std-static \ @@ -129,7 +129,7 @@ RUN dnf --quiet distro-sync -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN /usr/bin/pip3.11 install \ +RUN /usr/bin/pip3.12 install \ numpy \ opencv-python \ sphinx \ @@ -139,7 +139,7 @@ ENV CCACHE_WRAPPERSDIR=3D"/usr/libexec/ccache-wrappers" ENV LANG=3D"en_US.UTF-8" ENV MAKE=3D"/usr/bin/make" ENV NINJA=3D"/usr/bin/ninja" -ENV PYTHON=3D"/usr/bin/python3.11" +ENV PYTHON=3D"/usr/bin/python3.12" # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 9bc87b4879f..321f6bc5926 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -4,14 +4,14 @@ mappings: Ubuntu2204: =20 python3: - CentOSStream9: python3.11 + CentOSStream9: python3.12 =20 python3-pip: - CentOSStream9: python3.11-pip + CentOSStream9: python3.12-pip FreeBSD: py312-pip =20 python3-setuptools: - CentOSStream9: python3.11-setuptools + CentOSStream9: python3.12-setuptools FreeBSD: py312-setuptools =20 python3-sphinx: @@ -26,10 +26,10 @@ mappings: CentOSStream9: =20 python3-venv: - CentOSStream9: python3.11 + CentOSStream9: python3.12 =20 python3-wheel: - CentOSStream9: python3.11-wheel + CentOSStream9: python3.12-wheel FreeBSD: py312-wheel =20 python3-numpy: diff --git a/tests/lcitool/targets/centos-stream-9.yml b/tests/lcitool/targ= ets/centos-stream-9.yml index c2d87f6cb4d..0d6801fd9a3 100644 --- a/tests/lcitool/targets/centos-stream-9.yml +++ b/tests/lcitool/targets/centos-stream-9.yml @@ -1,3 +1,3 @@ paths: - pip3: /usr/bin/pip3.11 - python: /usr/bin/python3.11 + pip3: /usr/bin/pip3.12 + python: /usr/bin/python3.12 --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634967; cv=none; d=zohomail.com; s=zohoarc; b=B71urAbDnAuV7hlNJVHoQb4pcEgxfiDeaXwXTxIJF1bDJN+gNc2o5RKmEj2uviGfcIPPRHLpUaNAltqh62InWdpXdWO7wmJvtZaVSBzrNRfdG078vvdXo7AMssTFuIZxhvOHofLLwS7r7vVXSmIFw5BmeN2KjJRf6cprsXAbmA8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634967; h=Content-Type: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=dIkRMj6sKHjKTDuai6nTO2dcoH308/Y/5k+OLVV9y4M=; b=AHHwD6AFgUffWivt7qOhQBaanBJeRm2w2KSOChW5ZJdHIRILHRmEc9pJkZSfDD5cPRpUZgaA7qtu9dvka3eU07EiSK92ctMvvGryAmx2xMnY8EkjyhLRX895GA2tHvfJiRTNoQcSWenpbOZTs+jlqLZ8S/ao/7i52tmRYQTHiME= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634967348655.5160339970399; Mon, 24 Aug 2026 22:16:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVS-0002b6-0b; Tue, 25 Aug 2026 01:15:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVQ-0002ar-FO for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:28 -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 1wyjVP-0004pL-1D for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:28 -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-496-HQqI147HNDKxypkGCh-Pdw-1; Tue, 25 Aug 2026 01:15:21 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 CD97B180AC7F; Tue, 25 Aug 2026 05:15:19 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B31B71955F76; Tue, 25 Aug 2026 05:15:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dIkRMj6sKHjKTDuai6nTO2dcoH308/Y/5k+OLVV9y4M=; b=anmhSbPv/9W0kcJvXiPtkteHG8pWob7i4OoTWbzWnmZGMXz9UTuceNhv53XLd4z6is3xxd C2TXC2bq8iYuhWnHOGHlb+lseLgiCFtqzCIpQizZSeYqJBI7AmYKYvWul4TG1mxlbEdG67 0n4EKyCeUhZPZ6OVmymxUjRzzPpdHt4= X-MC-Unique: HQqI147HNDKxypkGCh-Pdw-1 X-Mimecast-MFC-AGG-ID: HQqI147HNDKxypkGCh-Pdw_1787634919 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 07/16] tests: update emsdk-wasm64-cross Date: Tue, 25 Aug 2026 01:14:32 -0400 Message-ID: <20260825051441.1562454-8-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787634968993158500 This container currently uses Ubuntu 22.04 as a base, which is no longer supported by QEMU as a build platform. Upgrade to a newer version of the image which will provide Python3.12+. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Kohei Tokunaga --- tests/docker/dockerfiles/emsdk-wasm64-cross.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/emsdk-wasm64-cross.docker b/tests/doc= ker/dockerfiles/emsdk-wasm64-cross.docker index c04a741b0e5..f11a9f34244 100644 --- a/tests/docker/dockerfiles/emsdk-wasm64-cross.docker +++ b/tests/docker/dockerfiles/emsdk-wasm64-cross.docker @@ -1,6 +1,6 @@ # syntax =3D docker/dockerfile:1.5 =20 -ARG EMSDK_VERSION_QEMU=3D4.0.10 +ARG EMSDK_VERSION_QEMU=3D5.0.2 ARG ZLIB_VERSION=3D1.3.2 ARG GLIB_MINOR_VERSION=3D2.84 ARG GLIB_VERSION=3D${GLIB_MINOR_VERSION}.0 @@ -27,7 +27,7 @@ RUN apt-get update && apt-get install -y \ pkgconf \ ninja-build \ python3-pip -RUN pip3 install meson=3D=3D${MESON_VERSION} tomli +RUN pip3 install --break-system-packages meson=3D=3D${MESON_VERSION} tomli RUN mkdir /build WORKDIR /build RUN mkdir -p $TARGET --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787635016; cv=none; d=zohomail.com; s=zohoarc; b=edOHGe57Uk75dqYYMVZH9bJr2jA6VkQKQjZXEZkhYNCapkZuBSz+DkSHtJCx1BDqEJLLPz7nbkDHEMtxsC1m4kKnWMaQXYeUyjvwkWhd2PgOfYK3WcQPoNjh8TGAe7inQeE9JmZ89smTOxR3ZadDHnvlrrY00lki4UFG6WJhHdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787635016; h=Content-Type: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=VEcAaD4igYl3AN0+OokAtDZS17KO2yD95G3hSBkxlyg=; b=ldRqEjyqVgls05WSiy6qk0lO9J4WKOj1KJ38Hi3F+bMTu4V/OBCIfoooGl7QSCPCXwoYfKUk+2DZhY3NLUfzmUyNnnmQM5fz3oQjpZzAOvVLTgTqClb+acbplGxpjsTnFePnFQjzjApMwvcA3ZqZlHIF7amwT2oyRWwj3lKQCdQ= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787635016126976.3253031373739; Mon, 24 Aug 2026 22:16:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVX-0002eB-IO; Tue, 25 Aug 2026 01:15:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVU-0002bQ-2Z for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:32 -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 1wyjVS-0004q9-Jc for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:31 -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-168-scpFb84DOdaf-dTtVJu2GQ-1; Tue, 25 Aug 2026 01:15:26 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 25DCF180AD66; Tue, 25 Aug 2026 05:15:24 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 205CA1955F76; Tue, 25 Aug 2026 05:15:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VEcAaD4igYl3AN0+OokAtDZS17KO2yD95G3hSBkxlyg=; b=b6Q0h7znotavAYe4Dy9lUFhpcr8bWc+SejsvqEDggD6Ke/ksyHDea0XTOj7vBDdbNn0vxn RftKJ1taIgvakeQBYn6TvGp8v4lzE766/sRp2OgsnHcbfKjGSJgBeUmoVj2epU3UucafJT F4Ub9qUMPC1QCwD+yu3fAJlepYe6Q0I= X-MC-Unique: scpFb84DOdaf-dTtVJu2GQ-1 X-Mimecast-MFC-AGG-ID: scpFb84DOdaf-dTtVJu2GQ_1787634924 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 08/16] qapi: update type hint for objects_seen Date: Tue, 25 Aug 2026 01:14:33 -0400 Message-ID: <20260825051441.1562454-9-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787635016841158500 In preparation for upgrading Python to 3.12+, adjust the type hint on objects_seen to prevent mypy from chirping about an unknown type for this variable. Why didn't this trigger earlier? A mystery for the ages. Signed-off-by: John Snow Reviewed-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi/types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index 2bf75338283..b87377c6474 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -34,7 +34,7 @@ =20 # variants must be emitted before their container; track what has already # been output -objects_seen =3D set() +objects_seen: set[str] =3D set() =20 =20 def gen_enum_lookup(name: str, --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634977; cv=none; d=zohomail.com; s=zohoarc; b=a0ENRFclYn2v2tYXCsPu8B6m1mdhN45+XijO2iZzwuinMbfI25/vY4Rru51VX146Cq2m8JjueNLPbHa3p92dRZ9Zds/tsmpIQI4Gola6XFpJcaY5ZbumYdKl+CodbI5m63p0h8cRZgGzhNQ3PpLEWvV+l+Spu3xsIck7FIOzIgs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634977; 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=dDlFdwesFokSoeC1mFF3xfLMMQ8p1FcUj0HBFuJz/x4=; b=DTgbpQYN2b4ugO2ItJ10mqH6ellW01MYetediz3uCje6Wp/L0SVMn3nhJL/ky0B6OfCHuNtS1fHG/X2F+iYkiiDkteN6YL4xtfvjLMApSt7uRuJvXdZDQQlZobqlVx8jYwDF7C5hZ847kZMkXZHwjN4dPsQdKaEqRUDLOUzkWe4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 178763497755646.057249133895425; Mon, 24 Aug 2026 22:16:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVb-0002fU-GS; Tue, 25 Aug 2026 01:15:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVZ-0002f3-Me for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:37 -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 1wyjVW-0004to-G3 for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:36 -0400 Received: from mx-prod-mc-01.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-619-kydcTFQ7NXirIjLa0s3_Iw-1; Tue, 25 Aug 2026 01:15:30 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6F42D195394F; Tue, 25 Aug 2026 05:15:28 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AA2891955F76; Tue, 25 Aug 2026 05:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634933; 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=dDlFdwesFokSoeC1mFF3xfLMMQ8p1FcUj0HBFuJz/x4=; b=YxqmT6FLOBhaVfhCjttl9eP9ccfG1Eq8N4jGxlOyTO+dubejPA0XpluRzOHHbKSrzSxG9c foOA/vFNCgK0rgb7lhZQZtW+BsQ9PRem4BoLYfhBXb/hhNvduXV/ku1MqmM79kJKQU7cly IC/IgTxYvKcFNnNDf4qIfd2lsWlbRHg= X-MC-Unique: kydcTFQ7NXirIjLa0s3_Iw-1 X-Mimecast-MFC-AGG-ID: kydcTFQ7NXirIjLa0s3_Iw_1787634928 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 09/16] python: upgrade to Python3.12+ Date: Tue, 25 Aug 2026 01:14:34 -0400 Message-ID: <20260825051441.1562454-10-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787634979154158500 Content-Type: text/plain; charset="utf-8" With Python3.9 EOL and Python3.10 soon to be EOL (October 2026), and with ... no other supported build platform actually using Python 3.11, require the use of Python3.12 or later. Additionally, as part of this upgrade, remove the use of tomllib from mkvenv as it is now standard in the Python stdlib: leaving this transitional code in causes a regression with mypy which becomes confused about the overloaded use of 'tomllib'. Our current minimum requirements as determined by standard repository packages on supported distributions is as follows: distro EOS python3 pip setuptools sphinx wheel Reviewed-by: Daniel P. Berrang=C3=A9 ------------------------------------------------------------------------- centos_stream_9 2026-12-12 3.9.25 21.3.1 53.0.0 3.4.3 0.36.2 centos_stream_9+ 2026-12-12 3.12.13 23.2.1 68.2.2 --- 0.41.2 freebsd -- 3.12.14 23.3.2 63.1.0 9.0.4 0.48.0 ubuntu_24_04 2028-04-23 3.12.3 24.0 68.1.2 7.2.6 0.42.0 centos_stream_10 2030-01-01 3.12.13 23.3.2 69.0.3 7.2.6 0.41.2 alpine_3_21 2026-11-01 3.12.14 24.3.1 70.3.0 8.1.3 0.43.0 debian_13 2028-08-09 3.13.5 25.1.1 78.1.1 8.1.3 0.46.1 fedora_43 2026-12-09 3.14.7 25.1.1 78.1.1 8.2.3 0.45.1 ubuntu_26_04 2031-05-29 3.14.4 25.1.1 78.1.1 8.2.3 0.46.3 fedora_44 2027-06-02 3.14.7 26.0.1 80.10.2 8.2.3 0.45.1 macports -- 3.14.7 26.0.1 80.10.2 9.1.0 0.48.0 alpine_3_22 2027-05-01 3.12.14 25.1.1 80.9.0 8.2.3 0.46.3 alpine_3_23 2027-11-01 3.12.14 25.1.1 80.9.0 8.2.3 0.46.3 openbsd -- 3.14.6 26.2.1 80.9.0 9.1.0 0.48.0 alpine_3_24 2028-06-01 3.14.7 26.1.2 82.0.1 9.1.0 0.47.0 pkgsrc_current -- 3.13.15 26.2.1 84.0.0 9.1.0 0.48.0 CentOS stream 9 note: python3.12, python3.12-pip, python3.12-setuptools and python3.12-wheel are available as optional packages in the standard repository. Sphinx is not available, but can be side-loaded from PyPI using pip3.12. Signed-off-by: John Snow --- configure | 11 ++++--- python/Makefile | 10 +++---- python/scripts/mkvenv.py | 63 ++++------------------------------------ python/setup.cfg | 17 ++++------- python/tests/minreqs.txt | 41 ++++++++++++-------------- pythondeps.toml | 9 ++---- 6 files changed, 43 insertions(+), 108 deletions(-) diff --git a/configure b/configure index 56158cd95f7..46cbcc085b3 100755 --- a/configure +++ b/configure @@ -503,17 +503,16 @@ if test -n "$linux_arch" && ! test -d "$source_path/l= inux-headers/asm-$linux_arc fi =20 check_py_version() { - # We require python >=3D 3.9. + # We require python >=3D 3.12. # NB: a True python conditional creates a non-zero return code (Failur= e) - "$1" -c 'import sys; sys.exit(sys.version_info < (3,9))' + "$1" -c 'import sys; sys.exit(sys.version_info < (3,12))' } =20 first_python=3D if test -z "${PYTHON}"; then # A bare 'python' is traditionally python 2.x, but some distros # have it as python 3.x, so check in both places. - for binary in python3 python python3.14 python3.13 python3.12 \ - python3.11 python3.10 python3.9 ; do + for binary in python3 python python3.14 python3.13 python3.12; do if has "$binary"; then python=3D$(command -v "$binary") if check_py_version "$python"; then @@ -902,7 +901,7 @@ then # If first_python is set, there was a binary somewhere even though # it was not suitable. Use it for the error message. if test -n "$first_python"; then - error_exit "Cannot use '$first_python', Python >=3D 3.9 is require= d." \ + error_exit "Cannot use '$first_python', Python >=3D 3.12 is requir= ed." \ "Use --python=3D/path/to/python to specify a supported Python." else error_exit "Python not found. Use --python=3D/path/to/python" @@ -910,7 +909,7 @@ then fi =20 if ! check_py_version "$python"; then - error_exit "Cannot use '$python', Python >=3D 3.9 is required." \ + error_exit "Cannot use '$python', Python >=3D 3.12 is required." \ "Use --python=3D/path/to/python to specify a supported Python= ." \ "Maybe try:" \ " CentOS: dnf install python3.12" diff --git a/python/Makefile b/python/Makefile index 42994d39618..7868a48a232 100644 --- a/python/Makefile +++ b/python/Makefile @@ -9,14 +9,14 @@ help: @echo "make check-minreqs:" @echo " Run tests in the minreqs virtual environment." @echo " These tests use the oldest dependencies." - @echo " Requires: Python 3.9" - @echo " Hint (Fedora): 'sudo dnf install python3.9'" + @echo " Requires: Python 3.12" + @echo " Hint (Fedora): 'sudo dnf install python3.12'" @echo "" @echo "make check-tox:" @echo " Run tests against multiple python versions." @echo " These tests use the newest dependencies." - @echo " Requires: Python 3.9 - 3.11, and tox." - @echo " Hint (Fedora): 'sudo dnf install python3-tox python3.11'" + @echo " Requires: Python 3.12 - 3.14, and tox." + @echo " Hint (Fedora): 'sudo dnf install python3-tox python3.14'" @echo " The variable QEMU_TOX_EXTRA_ARGS can be use to pass extra" @echo " arguments to tox". @echo "" @@ -59,7 +59,7 @@ PIP_INSTALL =3D pip install --disable-pip-version-check min-venv: $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate $(QEMU_MINVENV_DIR) $(QEMU_MINVENV_DIR)/bin/activate: setup.cfg tests/minr= eqs.txt @echo "VENV $(QEMU_MINVENV_DIR)" - @python3.9 -m venv $(QEMU_MINVENV_DIR) + @python3.12 -m venv $(QEMU_MINVENV_DIR) @( \ echo "ACTIVATE $(QEMU_MINVENV_DIR)"; \ . $(QEMU_MINVENV_DIR)/bin/activate; \ diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py index 8ed6a354505..e3954bb6d60 100644 --- a/python/scripts/mkvenv.py +++ b/python/scripts/mkvenv.py @@ -75,6 +75,7 @@ import subprocess import sys import sysconfig +import tomllib from types import SimpleNamespace from typing import ( Any, @@ -134,20 +135,6 @@ HAVE_PACKAGING_VERSION =3D _import_ok =20 =20 -# Try to load tomllib, with a fallback to tomli. -# HAVE_TOMLLIB is checked below, just-in-time, so that mkvenv does not fail -# outside the venv or before a potential call to ensurepip in checkpip(). -_import_ok =3D True -try: - import tomllib -except ImportError: - try: - import tomli as tomllib - except ImportError: - _import_ok =3D False - -HAVE_TOMLLIB =3D _import_ok - # Do not add any mandatory dependencies from outside the stdlib: # This script *must* be usable standalone! =20 @@ -261,36 +248,6 @@ def get_parent_libpath(self) -> Optional[str]: return sysconfig.get_path("purelib") return None =20 - @staticmethod - def compute_venv_libpath(context: SimpleNamespace) -> str: - """ - Compatibility wrapper for context.lib_path for Python < 3.12 - """ - # Python 3.12+, not strictly necessary because it's documented - # to be the same as 3.10 code below: - if sys.version_info >=3D (3, 12): - return context.lib_path - - # Python 3.10+ - if "venv" in sysconfig.get_scheme_names(): - lib_path =3D sysconfig.get_path( - "purelib", scheme=3D"venv", vars=3D{"base": context.env_di= r} - ) - assert lib_path is not None - return lib_path - - # For Python <=3D 3.9 we need to hardcode this. Fortunately the - # code below was the same in Python 3.6-3.10, so there is only - # one case. - if sys.platform =3D=3D "win32": - return os.path.join(context.env_dir, "Lib", "site-packages") - return os.path.join( - context.env_dir, - "lib", - "python%d.%d" % sys.version_info[:2], - "site-packages", - ) - def ensure_directories(self, env_dir: DirType) -> SimpleNamespace: logger.debug("ensure_directories(env_dir=3D%s)", env_dir) self._context =3D super().ensure_directories(env_dir) @@ -313,7 +270,8 @@ def post_post_setup(self, context: SimpleNamespace) -> = None: assert parent_libpath is not None logger.debug("parent_libpath: %s", parent_libpath) =20 - our_libpath =3D self.compute_venv_libpath(context) + assert isinstance(context.lib_path, str) + our_libpath =3D context.lib_path logger.debug("our_libpath: %s", our_libpath) =20 pth_file =3D os.path.join(our_libpath, "nested.pth") @@ -810,19 +768,8 @@ def _do_ensure( =20 =20 def _parse_groups(file: str) -> Dict[str, Dict[str, Any]]: - if not HAVE_TOMLLIB: - if sys.version_info < (3, 11): - raise Ouch("found no usable tomli, please install it") - - raise Ouch( - "Python >=3D3.11 does not have tomllib... what have you done!?" - ) - - # Use loads() to support both tomli v1.2.x (Ubuntu 22.04, - # Debian bullseye-backports) and v2.0.x - with open(file, "r", encoding=3D"ascii") as depfile: - contents =3D depfile.read() - return tomllib.loads(contents) # type: ignore + with open(file, "rb") as depfile: + return tomllib.load(depfile) =20 =20 def ensure_group( diff --git a/python/setup.cfg b/python/setup.cfg index ad4121a58d8..8f62b7c1cdb 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -14,16 +14,13 @@ classifiers =3D Natural Language :: English Operating System :: OS Independent Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.9 - Programming Language :: Python :: 3.10 - Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 Programming Language :: Python :: 3.13 Programming Language :: Python :: 3.14 Typing :: Typed =20 [options] -python_requires =3D >=3D 3.9 +python_requires =3D >=3D 3.12 packages =3D qemu.machine qemu.utils @@ -39,12 +36,10 @@ devel =3D distlib >=3D 0.3.6 flake8 >=3D 5.0.4 fusepy >=3D 2.0.4 - isort >=3D 5.6.0 - # Max ver is temporary until we drop 3.9 - mypy >=3D 1.4.0, <2.0.0 + isort >=3D 5.11.3 + mypy >=3D 1.4.0 pylint >=3D 2.17.3 - pylint !=3D 3.2.4; python_version<"3.9" - pytest >=3D 6.0.2 + pytest >=3D 6.2.4 tox >=3D 3.18.0 sphinx >=3D 3.4.3 =20 @@ -69,7 +64,7 @@ exclude =3D __pycache__, =20 [mypy] strict =3D True -python_version =3D 3.9 +python_version =3D 3.12 namespace_packages =3D True warn_unused_ignores =3D False =20 @@ -164,7 +159,7 @@ multi_line_output=3D3 # of python available on your system to run this test. =20 [tox:tox] -envlist =3D py39, py310, py311, py312, py313, py314 +envlist =3D py312, py313, py314 skip_missing_interpreters =3D true =20 [testenv] diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index 05c3bdb89f8..85cfa08cf76 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -1,5 +1,5 @@ # This file lists the ***oldest possible dependencies*** needed to run -# "make check" successfully under ***Python 3.9***. It is used primarily +# "make check" successfully under ***Python 3.12***. It is used primarily # by GitLab CI to ensure that our stated minimum versions in setup.cfg # are truthful and regularly validated. # @@ -11,18 +11,11 @@ # 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 -# also pin setuptools to version 70 or below. Otherwise, the -# installation of the QEMU package itself fails, failing to find -# setuptools. -setuptools<=3D70 -wheel=3D=3D0.34.2 - # Dependencies for qapidoc/qapi_domain et al sphinx=3D=3D3.4.3 =20 # Dependencies for qemu.machine -qemu.qmp=3D=3D0.0.5 +qemu.qmp=3D=3D0.0.6 =20 # Dependencies for mkvenv distlib=3D=3D0.3.6 @@ -31,32 +24,28 @@ distlib=3D=3D0.3.6 fusepy=3D=3D2.0.4 =20 # Test-runners, utilities, etc. -pytest=3D=3D6.0.2 +pytest=3D=3D6.2.4 =20 # Linters -flake8=3D=3D5.0.4 -isort=3D=3D5.6.0 +flake8=3D=3D6.1.0 +isort=3D=3D5.11.3 mypy=3D=3D1.4.0 -pylint=3D=3D2.17.3 +pylint=3D=3D3.0.0 =20 # Transitive flake8 dependencies mccabe=3D=3D0.7.0 -pycodestyle=3D=3D2.9.1 -pyflakes=3D=3D2.5.0 +pycodestyle=3D=3D2.11.0 +pyflakes=3D=3D3.1.0 =20 # Transitive mypy dependencies mypy-extensions=3D=3D1.0.0 -tomli=3D=3D1.1.0 typing-extensions=3D=3D4.7.1 =20 # Transitive pylint dependencies -astroid=3D=3D2.15.4 -dill=3D=3D0.2 -lazy-object-proxy=3D=3D1.4.0 +astroid=3D=3D3.0.0 +dill=3D=3D0.3.7 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 @@ -66,7 +55,8 @@ babel=3D=3D1.3 docutils=3D=3D0.12 imagesize=3D=3D0.5.0 packaging=3D=3D14.0 -pytz=3D=3D2011b0 +Pygments=3D=3D2.0 +pytz=3D=3D2014.9 requests=3D=3D2.5.0 snowballstemmer=3D=3D1.1 sphinxcontrib-applehelp=3D=3D1.0.0 @@ -75,3 +65,10 @@ sphinxcontrib-htmlhelp=3D=3D1.0.0 sphinxcontrib-jsmath=3D=3D1.0.0 sphinxcontrib-qthelp=3D=3D1.0.0 sphinxcontrib-serializinghtml=3D=3D1.0.0 + +# Transitive pytest dependencies +attrs=3D=3D19.2.0 +iniconfig=3D=3D1.0.0 +pluggy=3D=3D0.13 +py=3D=3D1.11.0 +toml=3D=3D0.10.0 diff --git a/pythondeps.toml b/pythondeps.toml index 061f0cff0c4..b1879c1a4da 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -38,14 +38,11 @@ sphinx_rtd_theme =3D { accepted =3D ">=3D0.5", installe= d =3D "1.2.2" } [tooling] "qemu.qmp" =3D { accepted =3D ">=3D0.0.5", installed =3D "0.0.6" } "qemu" =3D { path =3D "python/" } -# NB: The following dependencies should be a little bit more modern than -# the versions listed here, but we are still using Debian 11 for several -# GitLab CI tests, so we are further restricted. -"setuptools" =3D { accepted =3D ">=3D44.1.1" } -"wheel" =3D { accepted =3D ">=3D0.34.2" } +"setuptools" =3D { accepted =3D ">=3D63.1.0" } +"wheel" =3D { accepted =3D ">=3D0.41.2" } # pip should be guaranteed by mkvenv, this is merely a sanity check for # which version we are counting on being present. -"pip" =3D { accepted =3D ">=3D20.3.4" } +"pip" =3D { accepted =3D ">=3D23.2.1" } =20 # This test group is for functional tests, and can include dependencies # fetched from PyPI. --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634967; cv=none; d=zohomail.com; s=zohoarc; b=oIdiiUboG7ZRiMd6k5YbmhLjDK4p9KLJLVYek7zgJMwku4PzCaYv1GnIu8oXabVzJdTaE3o0fVIKIjGC3pwTsQRBG05UrFRVMzHiV/TWeF2JEZuN3QqNRfv+YwonJMLD/kIt7Qdt4wIF9RsHo2cgDcH4SCHh/0Z/AHQ1QsP7Atw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634967; h=Content-Type: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=1MlxUey1y3GPXnBC0m+Z5BQa1dAttqCONYMX6nXKIgQ=; b=LdUenjpTPAYMV1d9JTFN3RkwyZEPUU0VpkvFoDswaeEagtveJiZV57zaBDy+UnRjCkRdNsbTPWknYMEwZtiQVawXItrTpInq/0NyPdZhTFgNX5zbTrxANluXRA3NlFfo0NtZK9EGIFZLeOAtXfyGSZYyaB5MdFH84QhJ4/FNaEg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634967434658.5344771886654; Mon, 24 Aug 2026 22:16:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVf-0002fu-3Q; Tue, 25 Aug 2026 01:15:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVe-0002fX-3H for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:42 -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 1wyjVc-00050W-3W for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:41 -0400 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-396-5KxFYmHdMvioyYVCddj_OQ-1; Tue, 25 Aug 2026 01:15:34 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 0FC021955DC5; Tue, 25 Aug 2026 05:15:33 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B406C1955F76; Tue, 25 Aug 2026 05:15:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1MlxUey1y3GPXnBC0m+Z5BQa1dAttqCONYMX6nXKIgQ=; b=TaUwdlfMTa0Lg6lAeRD2wAXdsn+aMkqKa4b9Ghb+Oa9Z7aFV1Wbm+SmF3lnymWDSdsL5Lw ToZYCH75SLts0AXszLUvl+2CyMw+6Sv/i4PTbvuNFfVZ5r/cbHpZLBXWIYfdqkB2hVMXSY R86/kGELvEjvAyoL02NbBPX0xhopaVg= X-MC-Unique: 5KxFYmHdMvioyYVCddj_OQ-1 X-Mimecast-MFC-AGG-ID: 5KxFYmHdMvioyYVCddj_OQ_1787634933 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 10/16] python: fix license configuration Date: Tue, 25 Aug 2026 01:14:35 -0400 Message-ID: <20260825051441.1562454-11-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787634969006158500 License trove identifiers were deprecated in favor of SPDX identifiers, correct this to stop some whining from various python tooling. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau --- python/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.cfg b/python/setup.cfg index 8f62b7c1cdb..a22abba6c36 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -8,9 +8,9 @@ download_url =3D https://www.qemu.org/download/ description =3D QEMU Python Build, Debug and SDK tooling. long_description =3D file:PACKAGE.rst long_description_content_type =3D text/x-rst +license =3D GPL-2.0-or-later classifiers =3D Development Status :: 3 - Alpha - License :: OSI Approved :: GNU General Public License v2 (GPLv2) Natural Language :: English Operating System :: OS Independent Programming Language :: Python :: 3 :: Only --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787635000; cv=none; d=zohomail.com; s=zohoarc; b=UUr/TtwoTf2OfrnMIHBwZNiStO/Q3J4HLSRX4a0k2aY3NTWmH9yxP+V3L9Et6ymfadJ5CuSMoEOjRBKEYOIsgCaSzJ/Nzqlf5uESm6wAwOAqbwtAi8rEeKq3IzA1FhAVkgExKA/hv4YSUhbRobiNVWjg4SE0KZwz/smWQraXO0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787635000; h=Content-Type: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=oUbj+XMJv1EL3Ko5RJXarBD6z4op3fef3FtaH8w4l6M=; b=eFqlz4KsYksRvY/8iJ7SjjxglU+30f3MbXI0fa8tTieuqmrOzrK9nW/at6sKjDJkWHpf8RaM0+O81KiY+MZNxMlS/5WM6/4FbZQARI+bCtxORcGNJYO/ZqU8rlU7x50T1QG0unp2ITtnZSflsqFJw2Y99KtlRZ+j44wr5ea/6yw= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787635000073971.1699794977839; Mon, 24 Aug 2026 22:16:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVq-00031f-6A; Tue, 25 Aug 2026 01:15:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVl-0002tE-EV for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:49 -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 1wyjVh-000570-SV for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:49 -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-494-_zkANP5vNka19Db5CFAWCg-1; Tue, 25 Aug 2026 01:15:39 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 44C3C18345B4; Tue, 25 Aug 2026 05:15:37 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9F70F1955F76; Tue, 25 Aug 2026 05:15:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oUbj+XMJv1EL3Ko5RJXarBD6z4op3fef3FtaH8w4l6M=; b=SzC5UrE/HpvFjLq2UuU25YnIxR3osxIzF02O3EdZqS1owl/FUQXTQLdmlqxw467HmLOrQa nKiPDjHaXpN89B74TDrfqIMDpIkotHfructOgxKB8UvOc4vjaMik42ndOdhUBTDiAE+gBj /tH5RtJKxrHFDKK0kwQOm/QyUWwhJ3k= X-MC-Unique: _zkANP5vNka19Db5CFAWCg-1 X-Mimecast-MFC-AGG-ID: _zkANP5vNka19Db5CFAWCg_1787634937 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 11/16] python: allow mypy to run as the current python version Date: Tue, 25 Aug 2026 01:14:36 -0400 Message-ID: <20260825051441.1562454-12-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787635000714158500 Currently, we instruct mypy to run assuming a specific version of python. Lift this restriction so that under tox tests, it will always run assuming the current running version. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- python/setup.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/python/setup.cfg b/python/setup.cfg index a22abba6c36..f866f659574 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -64,7 +64,6 @@ exclude =3D __pycache__, =20 [mypy] strict =3D True -python_version =3D 3.12 namespace_packages =3D True warn_unused_ignores =3D False =20 --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787635029; cv=none; d=zohomail.com; s=zohoarc; b=c/BpEUl6LAXE2ROLTPTIthuW6d3WXxAQg5C1aN398rNGkbhHyx3nq4jp97pKCO0aceNcOmw5cG4/dy6g2DFp2BcfkpPGBX2mhqtRNLIinR7RIwBiAed97MxRYR4wSb/JHNcNo5CVCU/09iENPsgXAmVQG+ZnZkQwrvcGw/Uc7EA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787635029; h=Content-Type: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=A16i+Q089qOF+B9+OwHpvzilqiyRJD+CauoNwEsH7SU=; b=QFJKNoGZ6V9Fzz6PAPKLBOYFDDeaQHdTJoBD0ZoXGeVFFgXqBeqoqDLgEGQO6cLd3oFdRXSkypBm+pC8pQzYBbM7X2r5dAQ+w6tH1z2KobRByTPJW9cmaBZCutbxKUZsj9aywr8T0P2tzzS6g9fIL+vMG00AMe+vC+2hYmG6PkI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787635029060921.2526855513734; Mon, 24 Aug 2026 22:17:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVq-00034j-Ib; Tue, 25 Aug 2026 01:15:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVn-0002vr-0Z for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:53 -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 1wyjVl-000587-9w for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:50 -0400 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-519-5mlAsEmBPtGJoF_pyfS_gw-1; Tue, 25 Aug 2026 01:15:43 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 F37A81955DC5; Tue, 25 Aug 2026 05:15:41 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 863251955F76; Tue, 25 Aug 2026 05:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A16i+Q089qOF+B9+OwHpvzilqiyRJD+CauoNwEsH7SU=; b=eRio4Y4K2s7n6PdDOIY++111ZJlUJRuiF2PCIzZycv3Pi2K417JxfWydLEWqxSmssRbuI5 mnnR77u0ugt0bQeQEeO4btzTgiP64zD1OPzy45yTYbbh/vxl5G1je6edsQ+iyqXMkULkQU MnLhboXMmElj2JK42nO4vmNvhMci6j4= X-MC-Unique: 5mlAsEmBPtGJoF_pyfS_gw-1 X-Mimecast-MFC-AGG-ID: 5mlAsEmBPtGJoF_pyfS_gw_1787634942 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 12/16] python: remove distutils workarounds Date: Tue, 25 Aug 2026 01:14:37 -0400 Message-ID: <20260825051441.1562454-13-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787635030966158500 These are no longer necessary now that we are using Python3.12+. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau --- python/tests/linters.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/python/tests/linters.py b/python/tests/linters.py index 82b88aebb20..dd89fb00ba8 100644 --- a/python/tests/linters.py +++ b/python/tests/linters.py @@ -83,23 +83,13 @@ def test_mypy_iotests(self): cwd=3D"../tests/qemu-iotests/", ) =20 - # Setuptools v60 introduced the SETUPTOOLS_USE_DISTUTILS=3Dstdlib - # workaround; stdlib distutils was fully removed in Python - # 3.12+. Once we are on >=3D3.12+ exclusively, this workaround can be - # dropped safely. Until then, it is needed for some versions on - # Fedora/Debian distributions which relied upon distro-patched - # setuptools present in CPython, but not within setuptools itself. - def test_pylint_pkg(self): - os.environ["SETUPTOOLS_USE_DISTUTILS"] =3D "stdlib" check_call([sys.executable, "-m", "pylint", "qemu/"]) =20 def test_pylint_scripts(self): - os.environ["SETUPTOOLS_USE_DISTUTILS"] =3D "stdlib" check_call([sys.executable, "-m", "pylint", "scripts/"]) =20 def test_pylint_qapi(self): - os.environ["SETUPTOOLS_USE_DISTUTILS"] =3D "stdlib" check_call( [ sys.executable, @@ -113,7 +103,6 @@ def test_pylint_qapi(self): ) =20 def test_pylint_iotests(self): - os.environ["SETUPTOOLS_USE_DISTUTILS"] =3D "stdlib" check_call( [sys.executable, "-m", "linters", "--pylint"], cwd=3D"../tests/qemu-iotests/", --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634962; cv=none; d=zohomail.com; s=zohoarc; b=azXPgwwK69y8BWbWLMdPdTdkglC9okV6iKG4RpULBuEx7E/b+SzC/t0CnBl+Cg1kPFykMQMzWnPrgq4PK2Eou838Q2GY6q4+QMMeSMds5BiI7+3/WgNUJrqoi3RMEHg/7lbg0+udpiOT1hzAnlI8wfDk5sbVeRkLRRo/b/ZhyIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634962; h=Content-Type: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=hDAWEg6l+Q81zG9ScKJ1iMyFw+JyIm6Mu9DPEuuetVo=; b=WwOX956GxFvdb+HoK9ff9XPalosstWNKXrRLxnZx6xuulvtEozJMHlquP22jOHflWQZHvHhbC8pRTMtQfNJeBFtgsKtK0cosz/LyNnlDCLtuvArU6onyWv/ciS1rchuG/8Qd7zZtA7DrHHL1WPQ4tByjoRtvce0LHrAGM6mQ2g8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634962767636.7772192850058; Mon, 24 Aug 2026 22:16:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVt-000395-Uo; Tue, 25 Aug 2026 01:15:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVq-000324-3K for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:54 -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 1wyjVo-00058Y-2x for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:53 -0400 Received: from mx-prod-mc-01.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-425-0DWWrcEINlOFG6gN0zLPkQ-1; Tue, 25 Aug 2026 01:15:48 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 704481955BCE; Tue, 25 Aug 2026 05:15:46 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C69201955F76; Tue, 25 Aug 2026 05:15:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hDAWEg6l+Q81zG9ScKJ1iMyFw+JyIm6Mu9DPEuuetVo=; b=D8C6kW3drKJelV9AIzMwUvCC9gXUhvnhEffLGA3hFL87jH9RY3g732ryV9DFk6KM60fsxx YRFCoxqAj+A+lJPqppI6wA44Fowl0dcz8vntYgk4NJFYeb8Ts/myBqLoZnDJyg6jeMJ5qU JfWZLivr1uteWtTn/JFfXqdTIIl0ld4= X-MC-Unique: 0DWWrcEINlOFG6gN0zLPkQ-1 X-Mimecast-MFC-AGG-ID: 0DWWrcEINlOFG6gN0zLPkQ_1787634946 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 13/16] python: remove stale setup.cfg options Date: Tue, 25 Aug 2026 01:14:38 -0400 Message-ID: <20260825051441.1562454-14-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787634965315158500 With the recent version bumps, we no longer need these directives. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau --- python/setup.cfg | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/python/setup.cfg b/python/setup.cfg index f866f659574..ebb4230899c 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -65,7 +65,6 @@ exclude =3D __pycache__, [mypy] strict =3D True namespace_packages =3D True -warn_unused_ignores =3D False =20 [mypy-qemu.utils.qom_fuse] # fusepy has no type stubs: @@ -76,12 +75,6 @@ allow_subclassing_any =3D True [mypy-fuse] ignore_missing_imports =3D True =20 -[mypy-tomli] -ignore_missing_imports =3D True - -[mypy-tomllib] -ignore_missing_imports =3D True - [mypy-distlib] ignore_missing_imports =3D True =20 @@ -91,12 +84,6 @@ ignore_missing_imports =3D True [mypy-distlib.version] ignore_missing_imports =3D True =20 -[mypy-pip._vendor.distlib] -ignore_missing_imports =3D True - -[mypy-pip._vendor.distlib.scripts] -ignore_missing_imports =3D True - [mypy-pip._vendor.distlib.version] ignore_missing_imports =3D True =20 --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634996; cv=none; d=zohomail.com; s=zohoarc; b=TAfjoy5MN+VECo2tXYQbyLRuiAE2L16kuLzx3Hp+KBTtj/yWPYis3D8obOQy2HENQMRzs9hFGqRPNXFuNsuH1R4Icad3FQ0A6Yzhx8RN5aPi1Y9Y5GljKfhSSkMM4mqRLu1EClkLvoogkMW50V7tK/6jXOO7Qs7p+JePcWWII9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634996; h=Content-Type: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=RqSl61aDMCjzkcb/ARC7y1Ifen9Cnd6Wa0sG+p4vltI=; b=ZKVVFlnQ3Qr2TDY5r5WhMZrrgnsMHhZXD4cY2EpIRBwFcv65sQ6fffNuH8325jSPxQu4w5suqXuukukH+nAfMerMyEVHha2zCXBXTv1iJze+w2pVENmgRpDb1+oAoqpy2YsDmur3CX5PYss8R4NAJR+FipcPTSPn18d3hQyaJjU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634996105397.97249406453125; Mon, 24 Aug 2026 22:16:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVw-0003Vd-Ls; Tue, 25 Aug 2026 01:16:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVv-0003O0-I1 for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:59 -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 1wyjVt-00059Q-LR for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:15:59 -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-644-s78hNh5JM-GMWBqcVQZvEA-1; Tue, 25 Aug 2026 01:15:53 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 02196187BE2B; Tue, 25 Aug 2026 05:15:51 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B5C7B1955F76; Tue, 25 Aug 2026 05:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RqSl61aDMCjzkcb/ARC7y1Ifen9Cnd6Wa0sG+p4vltI=; b=YJBOmiLYejthrLDAUFPWR7DiDMxY+kdUKi6aqLDRaGXMNXG1+RncVfdERo6CXBvbZAkPU4 xdhxR+jtUlHstfwHzT5FW4Zfd53bDIFVWYIzSCzOw6SqzamcWa2iSk8Vq2ZWpp9rvDWTkd bLjP0AGRk7ctdie+S9YeHl7xWwT5KEY= X-MC-Unique: s78hNh5JM-GMWBqcVQZvEA-1 X-Mimecast-MFC-AGG-ID: s78hNh5JM-GMWBqcVQZvEA_1787634951 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 14/16] sphinx: require sphinx 7.2.6 Date: Tue, 25 Aug 2026 01:14:39 -0400 Message-ID: <20260825051441.1562454-15-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787634996742158500 Make the extraordinary leap from Sphinx 3.4.3 to Sphinx 7.2.6. Simplifications and cleanup will follow in subsequent patches. Note that CentOS Stream 9 only ships a version of Sphinx that runs on Python 3.9, so regardless of the version of Sphinx we require, if we require Python 3.10+, CentOS Stream 9 will be unable to build QEMU documentation in an isolated offline build environment. CentOS Stream 9 continues to be able to build documentation so long as PyPI access is permitted during configure, or if the requisite PyPI packages are installed prior to configure time. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/conf.py | 4 ++-- docs/requirements.txt | 2 +- python/setup.cfg | 2 +- python/tests/minreqs.txt | 29 ++++++++++++++++------------- pythondeps.toml | 4 ++-- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 7e35d2158d3..cded047b539 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -51,9 +51,9 @@ =20 # If your documentation needs a minimal Sphinx version, state it here. # -# 3.4.3 is the oldest version of Sphinx that ships on a platform we +# 7.2.6 is the oldest version of Sphinx that ships on a platform we # pledge build support for. -needs_sphinx =3D '3.4.3' +needs_sphinx =3D '7.2.6' =20 # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom diff --git a/docs/requirements.txt b/docs/requirements.txt index 87f7afcb2e7..c10c4cf7c91 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=3D6.2.1 +sphinx=3D=3D7.2.6 sphinx_rtd_theme=3D=3D1.2.2 diff --git a/python/setup.cfg b/python/setup.cfg index ebb4230899c..927f72a46f6 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -41,7 +41,7 @@ devel =3D pylint >=3D 2.17.3 pytest >=3D 6.2.4 tox >=3D 3.18.0 - sphinx >=3D 3.4.3 + sphinx >=3D 7.2.6 =20 # Provides qom-fuse functionality fuse =3D diff --git a/python/tests/minreqs.txt b/python/tests/minreqs.txt index 85cfa08cf76..7154ad40040 100644 --- a/python/tests/minreqs.txt +++ b/python/tests/minreqs.txt @@ -12,7 +12,7 @@ # on PyPI that allows the test suite to pass. =20 # Dependencies for qapidoc/qapi_domain et al -sphinx=3D=3D3.4.3 +sphinx=3D=3D7.2.6 =20 # Dependencies for qemu.machine qemu.qmp=3D=3D0.0.6 @@ -48,23 +48,26 @@ platformdirs=3D=3D2.2.0 tomlkit=3D=3D0.10.1 =20 # Transitive sphinx dependencies -Jinja2=3D=3D2.7 -MarkupSafe=3D=3D1.1.0 alabaster=3D=3D0.7.1 -babel=3D=3D1.3 -docutils=3D=3D0.12 -imagesize=3D=3D0.5.0 -packaging=3D=3D14.0 -Pygments=3D=3D2.0 -pytz=3D=3D2014.9 -requests=3D=3D2.5.0 -snowballstemmer=3D=3D1.1 +babel=3D=3D2.9 +certifi=3D=3D2023.5.7 +charset-normalizer=3D=3D2.0.0 +docutils=3D=3D0.18.1 +idna=3D=3D2.5 +imagesize=3D=3D1.3 +Jinja2=3D=3D3.0.0 +MarkupSafe=3D=3D2.0 +packaging=3D=3D21.0 +Pygments=3D=3D2.14 +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.9 +urllib3=3D=3D1.26 =20 # Transitive pytest dependencies attrs=3D=3D19.2.0 diff --git a/pythondeps.toml b/pythondeps.toml index b1879c1a4da..f0f3af915a1 100644 --- a/pythondeps.toml +++ b/pythondeps.toml @@ -28,8 +28,8 @@ meson =3D { accepted =3D ">=3D1.12.0", installed =3D "1.1= 2.0", canary =3D "meson" } =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 ">=3D7.2.6", installed =3D "7.2.6", canary =3D "= sphinx-build" } +sphinx_rtd_theme =3D { accepted =3D ">=3D1.2.2", installed =3D "1.2.2" } =20 # This test group is for dependencies required to run various tooling # and tests that should always be installed at configure time. It should --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787634984; cv=none; d=zohomail.com; s=zohoarc; b=eXk6il0PI86B0im0+bXXEazW95fsyKY2cpeqF7DI4TqkVMpHQSgyLFxH3Q3iwc8PX5BwzHGlRmFACvWUG1m2GjzzGtc7GzxoMx86G1GQiwk419LvBcSCSvgzmuSA9eTxBc5FpepbH9xBnRPmt33YpEvbyQRe0qe9BxhJnZ+5Hxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787634984; h=Content-Type: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=zk5epx61BNWuX+gViUBZ3MC0IEPi+I97D9JbESOchGc=; b=caI9gRW81kwvxCYAQTdayMr0+UJkak4JUaF3SM35kNRjBNtIA7TXH8Cls7WUhI6pkAersey3aBorenwZb9IKNGuC2xXji2KD//q5Hv/e6JGHhp8ldHPeoYGzH/aOvkQ6tcyDRpVG6sCvwkMQgXRXPpoI/pM3AaCUmm121d8lwto= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787634984093928.252616164985; Mon, 24 Aug 2026 22:16:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjVz-0003oC-Jf; Tue, 25 Aug 2026 01:16:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjVx-0003bY-9G for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:16:01 -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 1wyjVv-00059i-Gl for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:16:01 -0400 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-363-bwq-655BNhawdqqAePkC9w-1; Tue, 25 Aug 2026 01:15:56 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 17D791954B26; Tue, 25 Aug 2026 05:15:55 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3B6781955F76; Tue, 25 Aug 2026 05:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zk5epx61BNWuX+gViUBZ3MC0IEPi+I97D9JbESOchGc=; b=JwZhGBZrZBtGNUxtPxfK8h9FMNMfRV6AWiRMeVoG2gtBRMJVtSjA68GG+dMiZ7I9CAt2YL m5yCK1HXRKF/OS8RyndgbVccZJJqys/eKLYw2tXlx/cgqNB8KzMYUliZkjF3nVfSjXp6cl sy1lw96vJkgb2sv4HtdhYcBLItwrCw4= X-MC-Unique: bwq-655BNhawdqqAePkC9w-1 X-Mimecast-MFC-AGG-ID: bwq-655BNhawdqqAePkC9w_1787634955 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 15/16] sphinx: drop fakedbusdoc Date: Tue, 25 Aug 2026 01:14:40 -0400 Message-ID: <20260825051441.1562454-16-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_SBL_CSS=3.335, SPF_HELO_PASS=-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: qemu development 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: 1787634984965158500 Now that we rely on a sufficiently modern Sphinx, we no longer need a stub doc for dbus. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/conf.py | 7 +------ docs/interop/dbus-display.rst | 14 +------------- docs/interop/dbus-vmstate.rst | 14 +------------- docs/interop/dbus-vnc.rst | 14 +------------- docs/sphinx/fakedbusdoc.py | 30 ------------------------------ 5 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 docs/sphinx/fakedbusdoc.py diff --git a/docs/conf.py b/docs/conf.py index cded047b539..914bae67d9c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -59,6 +59,7 @@ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions =3D [ + 'dbusdoc', 'depfile', 'hxtool', 'kerneldoc', @@ -67,12 +68,6 @@ 'qmp_lexer', ] =20 -if sphinx.version_info[:3] > (4, 0, 0): - tags.add('sphinx4') - extensions +=3D ['dbusdoc'] -else: - extensions +=3D ['fakedbusdoc'] - # Add any paths that contain templates here, relative to this directory. templates_path =3D [os.path.join(qemu_docdir, '_templates')] =20 diff --git a/docs/interop/dbus-display.rst b/docs/interop/dbus-display.rst index 87648e91dc0..c87a04c9693 100644 --- a/docs/interop/dbus-display.rst +++ b/docs/interop/dbus-display.rst @@ -18,16 +18,4 @@ QEMU also implements the standard interfaces, such as :local: :depth: 1 =20 -.. only:: sphinx4 - - .. dbus-doc:: ui/dbus-display1.xml - -.. only:: not sphinx4 - - .. warning:: - Sphinx 4 is required to build D-Bus documentation. - - This is the content of ``ui/dbus-display1.xml``: - - .. literalinclude:: ../../ui/dbus-display1.xml - :language: xml +.. dbus-doc:: ui/dbus-display1.xml diff --git a/docs/interop/dbus-vmstate.rst b/docs/interop/dbus-vmstate.rst index 5fb3f279e28..5f8c6d125de 100644 --- a/docs/interop/dbus-vmstate.rst +++ b/docs/interop/dbus-vmstate.rst @@ -23,16 +23,4 @@ dbus-vmstate object can be configured with the expected = list of helpers by setting its ``id-list`` property, with a comma-separated ``Id`` list. =20 -.. only:: sphinx4 - - .. dbus-doc:: backends/dbus-vmstate1.xml - -.. only:: not sphinx4 - - .. warning:: - Sphinx 4 is required to build D-Bus documentation. - - This is the content of ``backends/dbus-vmstate1.xml``: - - .. literalinclude:: ../../backends/dbus-vmstate1.xml - :language: xml +.. dbus-doc:: backends/dbus-vmstate1.xml diff --git a/docs/interop/dbus-vnc.rst b/docs/interop/dbus-vnc.rst index d2b77978f63..5ea4fd57183 100644 --- a/docs/interop/dbus-vnc.rst +++ b/docs/interop/dbus-vnc.rst @@ -11,16 +11,4 @@ Objects are exported under ``/org/qemu/Vnc1/``. :local: :depth: 1 =20 -.. only:: sphinx4 - - .. dbus-doc:: tools/qemu-vnc/qemu-vnc1.xml - -.. only:: not sphinx4 - - .. warning:: - Sphinx 4 is required to build D-Bus documentation. - - This is the content of ``tools/qemu-vnc/qemu-vnc1.xml``: - - .. literalinclude:: ../../tools/qemu-vnc/qemu-vnc1.xml - :language: xml +.. dbus-doc:: tools/qemu-vnc/qemu-vnc1.xml diff --git a/docs/sphinx/fakedbusdoc.py b/docs/sphinx/fakedbusdoc.py deleted file mode 100644 index 2d2e6ef6403..00000000000 --- a/docs/sphinx/fakedbusdoc.py +++ /dev/null @@ -1,30 +0,0 @@ -# D-Bus XML documentation extension, compatibility gunk for -"""dbus-doc is a Sphinx extension that provides documentation from D-Bus X= ML.""" - -from docutils.parsers.rst import Directive -from sphinx.application import Sphinx -from typing import Any, Dict - - -class FakeDBusDocDirective(Directive): - has_content =3D True - required_arguments =3D 1 - - def run(self): - return [] - - -def setup(app: Sphinx) -> Dict[str, Any]: - """Register a fake dbus-doc directive with Sphinx""" - app.add_directive("dbus-doc", FakeDBusDocDirective) - - return dict( - parallel_read_safe =3D True, - parallel_write_safe =3D True - ) --=20 2.55.0 From nobody Sat Sep 26 23:03:38 2026 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=1787635008; cv=none; d=zohomail.com; s=zohoarc; b=MbJRQ4OoqAhGZt4DGWoQlRhtGvHFhuH9FBHaxvEXwYdK42Kj2Hp969NC3EF0d0wanXiX1Piqa9pp2GC+aZfPe0nDHpKuRoAxJIhlh73u9+GzL7cM0sevth18qEQc1M6bt4bggpnv3Ov4eEUHuxhKWI0gx0nkiaEe6BdTTndT2Zo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787635008; h=Content-Type: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=WthprBU32ZwGMxVB61Gj2oF+jlm5AvU51l/PZFOvhPc=; b=QrDYLrHiFJTFunoayCMsWjBAI72XjRWHA6XqLGUquiVLtQX9Xg6Yj7gdWEDFjBcUUMNt7CkPAMEZPELlk2g3pw9CfjKIObzFzSl9HdBR/b/QHfS2hIReHug1PHCuHFQG45NhmURkp7sv49Xlu6xiv0EBnJZvtatIf+FB2uiglPk= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1787635008327328.4308673437332; Mon, 24 Aug 2026 22:16:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyjW5-0004Hg-8y; Tue, 25 Aug 2026 01:16:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wyjW4-0004Ed-6p for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:16:08 -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 1wyjW1-0005Aj-Ak for qemu-devel@nongnu.org; Tue, 25 Aug 2026 01:16:07 -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-621-A75E3ukpNF61zCJd001Zhw-1; Tue, 25 Aug 2026 01:16:02 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 69D4918707BF; Tue, 25 Aug 2026 05:15:59 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 498FE1955F76; Tue, 25 Aug 2026 05:15:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787634964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WthprBU32ZwGMxVB61Gj2oF+jlm5AvU51l/PZFOvhPc=; b=WFYnenUNuH2jbDEgsk/9+E90KUtkg+kGPItg24mqPZ+1p4uPmf9hTNVkS66P4ss+gtN6GP ZZCN+Wl/6eR/vSBAd1lEQERoArtyq0QyZEl1TRLYGBNNW2tqbrI6gO4mzznizc3j4RexJq 1w2VSof1Ybp3H1woCFEJBAnE7YGQE8s= X-MC-Unique: A75E3ukpNF61zCJd001Zhw-1 X-Mimecast-MFC-AGG-ID: A75E3ukpNF61zCJd001Zhw_1787634959 From: John Snow To: qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh , Kohei Tokunaga , Pierrick Bouvier , Cleber Rosa , Paolo Bonzini , Reinoud Zandijk , Kyle Evans , Michael Roth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , Mauro Carvalho Chehab Subject: [PATCH v2 16/16] sphinx: drop qapidoc back-compat overboiled spaghetti dinner Date: Tue, 25 Aug 2026 01:14:41 -0400 Message-ID: <20260825051441.1562454-17-jsnow@redhat.com> In-Reply-To: <20260825051441.1562454-1-jsnow@redhat.com> References: <20260825051441.1562454-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=lists1p.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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, SPF_HELO_PASS=-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: qemu development 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: 1787635008833158500 Drop the disgusting amount of hacks required to keep qapidoc working on older Sphinx versions, enjoying the cutting edge technology of 2023. This felt like an achievement to have written, and equally feels an achievement to have deleted. A note on the content_node parameter: Sphinx has been gradually implementing typing support and renaming parameters to be consistent. As a result of losing our intermediate compatibility shim, mypy and pylint now check directly against the Sphinx version. So, alongside removing compat gunk, we need to fix up some parameter naming for the Sphinx upgrade, too. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster --- docs/sphinx/compat.py | 230 ------------------------------------- docs/sphinx/qapi_domain.py | 53 +++++---- 2 files changed, 28 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 f561dc465f8..159857113a4 100644 --- a/docs/sphinx/qapi_domain.py +++ b/docs/sphinx/qapi_domain.py @@ -30,20 +30,10 @@ ) from sphinx.locale import _, __ from sphinx.roles import XRefRole -from sphinx.util import logging +from sphinx.util import docfields, logging 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 ( @@ -157,7 +147,10 @@ def result_nodes( return results, [] =20 =20 -class QAPIDescription(ParserFix): +Signature =3D str + + +class QAPIDescription(ObjectDescription[Signature]): """ Generic QAPI description. =20 @@ -315,7 +308,7 @@ class QAPIObject(QAPIDescription): =20 doc_field_types =3D [ # :feat name: descr - CompatGroupedField( + docfields.GroupedField( "feature", label=3D_("Features"), names=3D("feat",), @@ -327,8 +320,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 +330,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']})" ), @@ -376,7 +369,7 @@ def handle_signature(self, sig: str, signode: desc_sign= ature) -> Signature: =20 return sig =20 - def _add_infopips(self, contentnode: addnodes.desc_content) -> None: + def _add_infopips(self, content_node: addnodes.desc_content) -> None: # Add various eye-catches and things that go below the signature # bar, but precede the user-defined content. infopips =3D nodes.container() @@ -420,7 +413,7 @@ def _add_pip( ) =20 if infopips.children: - contentnode.insert(0, infopips) + content_node.insert(0, infopips) =20 def _validate_field(self, field: nodes.field) -> None: """Validate field lists in this QAPI Object Description.""" @@ -470,7 +463,17 @@ 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, + # Sphinx changed the name of the content_node parameter + # sometime after Sphinx 7.2.6, so no matter which name we + # choose, either our minimum tests or our bleeding edge tests + # will complain about the parameter rename. Use the eventual + # name and silence the error for our minreq tests. + # + # 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 +488,7 @@ def transform_content(self, content_node: addnodes.desc= _content) -> None: self._validate_field(field) =20 =20 -class SpecialTypedField(CompatTypedField): +class SpecialTypedField(docfields.TypedField): def make_field(self, *args: Any, **kwargs: Any) -> nodes.field: ret =3D super().make_field(*args, **kwargs) =20 @@ -518,14 +521,14 @@ class QAPICommand(QAPIObject): can_collapse=3DFalse, ), # :error: descr - CompatField( + docfields.Field( "error", label=3D_("Errors"), names=3D("error", "errors"), has_arg=3DFalse, ), # :return TypeName: descr - CompatGroupedField( + docfields.GroupedField( "returnvalue", label=3D_("Return"), rolename=3D"type", @@ -533,7 +536,7 @@ class QAPICommand(QAPIObject): can_collapse=3DTrue, ), # :return-nodesc: TypeName - CompatField( + docfields.Field( "returnvalue", label=3D_("Return"), names=3D("return-nodesc",), @@ -551,7 +554,7 @@ class QAPIEnum(QAPIObject): doc_field_types.extend( [ # :value name: descr - CompatGroupedField( + docfields.GroupedField( "value", label=3D_("Values"), names=3D("value",), @@ -568,7 +571,7 @@ class QAPIAlternate(QAPIObject): doc_field_types.extend( [ # :alt type name: descr - CompatTypedField( + docfields.TypedField( "alternative", label=3D_("Alternatives"), names=3D("alt",), --=20 2.55.0