From nobody Sat Sep 26 22:14:53 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=1787549396; cv=none; d=zohomail.com; s=zohoarc; b=L7SCS4xOUuW81ypYV5b3UpLatj/ZR5Rk/K7nPwfNsGJYOuPYCWiD/4u4Jeo9hON3y+KsJwQCfpOmnkRtCKnuAsPxMKAzHpLk35GWSNlPrznnmbwbPEKQMZV2OCReqh3sa6a6tgwN7SnSH/9jWpO1ryPhm8wBnp9fR3qyo8HFq2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549396; 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=8UVXxzKZQ+ePZ6mQ2Ukb+XaR6nuv8x8hDeCBA0D4Gog=; b=aWbWaE3aDtLMmpYjnmPjbGmzar3Ixrg7MiG1/zsYv2VnJIsxGv52+V3OG5AKcU+XPifpPVZC9EUEbgeGhjJq9GwvDneJmBL81Cpmg56lhjz/OU4Hx9TrDLq9f++h2woJ2vj7tltAit776ghhpxXszd45beLpAse6fpQMVCEGYyg= 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 1787549396479598.1550492650964; Sun, 23 Aug 2026 22:29:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFU-0000jz-6v; Mon, 24 Aug 2026 01:29:32 -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 1wyNFH-0000Yl-91 for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:22 -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 1wyNFE-0006js-B0 for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:18 -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-616-u0g4Y2wYNeSGtQ0Bp0pxIw-1; Mon, 24 Aug 2026 01:29:10 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 DC7C2180ACD2; Mon, 24 Aug 2026 05:29:08 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C88EA1800348; Mon, 24 Aug 2026 05:29:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549354; 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=8UVXxzKZQ+ePZ6mQ2Ukb+XaR6nuv8x8hDeCBA0D4Gog=; b=K+WmcF8yJ8EGxsTAxH4910fU4XIr9usljuR8jwt/Y6Y0e74T5bKSvaIuEzWR5tCX85VnW7 WO5JehUETw9xxI6gam4PRxUOpacKQopAcFPJOU6vlZYAKB9vLJpLYYQ1kRT3IxnZIYt0bD YD6sn6MAQqbelgcM1NznFAAK5yFhTjU= X-MC-Unique: u0g4Y2wYNeSGtQ0Bp0pxIw-1 X-Mimecast-MFC-AGG-ID: u0g4Y2wYNeSGtQ0Bp0pxIw_1787549349 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 01/12] tests: re-add opencv2 and numpy dependencies Date: Mon, 24 Aug 2026 01:28:47 -0400 Message-ID: <20260824052859.880475-2-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: 1787549397626158500 Content-Type: text/plain; charset="utf-8" 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 | 12 ++++++++++++ tests/lcitool/projects/qemu.yml | 2 ++ tests/vm/generated/freebsd.json | 2 ++ 22 files changed, 52 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 1816556dde4..2b317e0a61c 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -21,6 +21,12 @@ mappings: python3-sphinx-rtd-theme: CentOSStream9: =20 + python3-numpy: + CentOSStream9: + + python3-opencv: + CentOSStream9: + python3-venv: CentOSStream9: python3.11 =20 @@ -54,3 +60,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 dfa8b41a524..3beec924e8f 100644 --- a/tests/vm/generated/freebsd.json +++ b/tests/vm/generated/freebsd.json @@ -49,9 +49,11 @@ "ncurses", "nettle", "ninja", + "opencv", "pixman", "pkgconf", "png", + "py311-numpy", "py311-pip", "py311-setuptools", "py311-sphinx", --=20 2.55.0 From nobody Sat Sep 26 22:14:53 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=1787549395; cv=none; d=zohomail.com; s=zohoarc; b=YsFIAYdUUiqx6Sk3IIXwKmCc5yFv2N8ty1hGrE9NEw5dk9DavhWTFSb5mC11aBKWATUUilHXRSTXVY2qUsfIo0aRjVh6dqFmobzMm8x6rVCTmZAuNrkxexAR2ySR0fLetUMzDvUilhK1PIRe01H91uRrngBH4T558EVn+wHDSyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549395; 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=zbgFy+i/MBg6WIUZ6vfnbgcVFnDOzreG7LA3LljSXG4=; b=IR9btypkul8MV+7dgWYcoEoTK3GqMN5dU3ZkXHfBjPONkwaref3G0qjruAOaaMbxehu68IRHQSzE1Yv7s6xh/fh8GixdMRLlaP1YlLGlPlDrBOGgrzPIu4HDMMeZTb81nI3I/MckPQzySK5cLjV8+5yfyhbsALGry2ky0yIjAVU= 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 1787549395684145.11637786011102; Sun, 23 Aug 2026 22:29:55 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFh-0000xw-9V; Mon, 24 Aug 2026 01:29:45 -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 1wyNFJ-0000Z1-5S for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:23 -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 1wyNFH-0006kC-JK for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:20 -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-267-1K0u2OdHMZylrx2CSoy4DA-1; Mon, 24 Aug 2026 01:29:13 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 2D5721944DEA; Mon, 24 Aug 2026 05:29:12 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 222581800348; Mon, 24 Aug 2026 05:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549358; 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=zbgFy+i/MBg6WIUZ6vfnbgcVFnDOzreG7LA3LljSXG4=; b=RxCWsZmOUcxu72Ugf5ekucWhI8Qt90IUYWVRndce7YQEMYDcjf9lR9WihT5oMmZA/lJXv+ GBYNThPkglYusNDUcwxeQ8Yd0CoD6P92SX54u5pefyfAwwAGUqBTSz5VEMUYuPdNqZE3Sq XEIpb5GiJcdu1U5iqWG4tHWH2p133KU= X-MC-Unique: 1K0u2OdHMZylrx2CSoy4DA-1 X-Mimecast-MFC-AGG-ID: 1K0u2OdHMZylrx2CSoy4DA_1787549352 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 02/12] tests: add Python3.12 to centos9.docker Date: Mon, 24 Aug 2026 01:28:48 -0400 Message-ID: <20260824052859.880475-3-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549397524158500 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 --- tests/docker/dockerfiles/centos9.docker | 12 ++++++------ tests/lcitool/mappings.yml | 12 ++++++------ tests/lcitool/targets/centos-stream-9.yml | 4 ++-- 3 files changed, 14 insertions(+), 14 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 2b317e0a61c..5c56e4aca1b 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -4,16 +4,16 @@ mappings: Ubuntu2204: =20 python3: - CentOSStream9: python3.11 + CentOSStream9: python3.12 =20 python3-devel: - CentOSStream9: python3.11-devel + CentOSStream9: python3.21-devel =20 python3-pip: - CentOSStream9: python3.11-pip + CentOSStream9: python3.12-pip =20 python3-setuptools: - CentOSStream9: python3.11-setuptools + CentOSStream9: python3.12-setuptools =20 python3-sphinx: CentOSStream9: @@ -28,10 +28,10 @@ mappings: CentOSStream9: =20 python3-venv: - CentOSStream9: python3.11 + CentOSStream9: python3.12 =20 python3-wheel: - CentOSStream9: python3.11-wheel + CentOSStream9: python3.12-wheel =20 meson: # Use Meson from PyPI wherever Rust is enabled 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 22:14:53 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=1787549403; cv=none; d=zohomail.com; s=zohoarc; b=Ovz4QD8Sb/dlsFHXZWCn16BuzRxqs0pQ2cwwcAbfn1VkY0XiZy4GXaersfV6zmOfneTx+A7uXKtdjvBLoyOZHaI8rpc1JzDSjmtqwKgtvmZcNeYOwPvVBCUuINVHtLeINJ8Hki2Pmq5A4KJAxv7q2GxLwtmSkOXCTfolR2V57Sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549403; 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=TH4c6HnowuFu5CvbgBQlykOA2IkGVA+5wBP1z2lgd+g=; b=FMp+YdZOk0rw4zu0gI3Ys2nDzcDlNp9hMeRMIs9F701xGORb+TNJ/Yq/7gWo1MUZiwebXjtlEdDe6N95petH0hmrcFYj98Z+5Vq2JF+PXV5iWHACJBgb8h8jRwDKxs5ruaKH8XE+l/V42mN9abk8pUI4veiLEIJQVPR6iGw+BB4= 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 1787549403582385.8294865138474; Sun, 23 Aug 2026 22:30:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFn-0001Fm-Nr; Mon, 24 Aug 2026 01:29:53 -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 1wyNFL-0000bP-K5 for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:25 -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 1wyNFK-0006kZ-8C for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:23 -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-513-BO47UyY7Ouuw_YZnyq5aAg-1; Mon, 24 Aug 2026 01:29:17 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 6CBC3180ABE7; Mon, 24 Aug 2026 05:29:15 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 664861800577; Mon, 24 Aug 2026 05:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549361; 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=TH4c6HnowuFu5CvbgBQlykOA2IkGVA+5wBP1z2lgd+g=; b=Be99MTuJp1NWfDLr8ZIK+k5OHLux6v+ZVt+56g6sgaHtfAKaWNx797CQAyzgECpq0PTfoQ vwh3Jd+DXxCwsQqwFHoMim+vyjb0GKnJ0LkXzZhPV8rI3VSRVJboIXxgx3jiRq3QfY+vMj QdNQ0YQxsSjMu8aElhZXTOqAKoA9JoA= X-MC-Unique: BO47UyY7Ouuw_YZnyq5aAg-1 X-Mimecast-MFC-AGG-ID: BO47UyY7Ouuw_YZnyq5aAg_1787549355 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 03/12] tests: update emsdk-wasm64-cross Date: Mon, 24 Aug 2026 01:28:49 -0400 Message-ID: <20260824052859.880475-4-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549405705158500 Content-Type: text/plain; charset="utf-8" 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: Kohei Tokunaga Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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 22:14:53 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=1787549403; cv=none; d=zohomail.com; s=zohoarc; b=QWCyt0k4Lf23KGbvKff1u/K2tTmAI0aqNNL9HftOHmBjGhj+mHVdw7MHamzUjWtrl3yGeCQqxKce70U2e5nZNv1kBuKfcZNbuXrT7otrJDuNXX1kIpxiTTtVCac7BmOQ9ioPYkX44UR4eKZbjirqVW1oENd//NrzZ9nR7BBnalE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549403; 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=mVoAGbNQywFOBd+C8tyDnKKdu/uXzrAWuWyd+vClfEs=; b=WYhuGgRtG9E1tbnBrANmiVM2xClqT3I67TppDsRA1V7fs7iNNWKd52nE22bmrU5Z56t+15jBYMAiDJjCWpHcALXnOL1Ny3coBX1O/Mso2tQ/toCpgQV91SXNKOjWz0pMR7vQ+k5cuJVlgCbXl1LeLbav26KTTqYCKxSYmzLynaQ= 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 1787549403913753.8656911496396; Sun, 23 Aug 2026 22:30:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFv-0001S7-Sy; Mon, 24 Aug 2026 01:29:59 -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 1wyNFS-0000jy-F7 for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:32 -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 1wyNFP-0006lB-TV for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:29 -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-247-OJf7oA4rMbOhDdGzOYuteA-1; Mon, 24 Aug 2026 01:29:20 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 6F5E6180ACC6; Mon, 24 Aug 2026 05:29:19 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0976E1800577; Mon, 24 Aug 2026 05:29:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549367; 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=mVoAGbNQywFOBd+C8tyDnKKdu/uXzrAWuWyd+vClfEs=; b=M4qabpDozEYkqoS8topb0HfibQU0aelAMDZhDFlKfwr9vDhafBaIMcl1IHuzlRhlR24Ggm MZXSD5fxEIxs5boBy7+4uOFT0W6/Gkk4SBbZM7LKPolv/XBF5Ko6IVA7qpkgS9YZ5XBDQd gxS/r0BkiGAk/GWYYWMHqHySb5VVPbY= X-MC-Unique: OJf7oA4rMbOhDdGzOYuteA-1 X-Mimecast-MFC-AGG-ID: OJf7oA4rMbOhDdGzOYuteA_1787549359 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 04/12] qapi: update type hint for types_seen Date: Mon, 24 Aug 2026 01:28:50 -0400 Message-ID: <20260824052859.880475-5-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549405691158500 Content-Type: text/plain; charset="utf-8" In preparation for upgrading Python to 3.12+, adjust the type hint on types_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: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster 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 22:14:53 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=1787549441; cv=none; d=zohomail.com; s=zohoarc; b=I7CweHux4FAxJ2uZ5/nsPTTg94ppAYd9cK4dtrz7lCEPnUHcJ2UvDpBcslUoILvtTsiI0D9gXMWXqjwIX8qcjT9rfLumwA9YVnIhNY0nodhSdzdOWQU6hWXmS3+cvejRWT622qRfRb1ajxR0QiaDrX2Fe+MVzLOMALtDvNqxNAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549441; 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=g3XbYUZgnbchzQXP9HZa6yXxYah/vFREvl8Yw5CQ6l8=; b=D0RpjZXdqs6MlkMDHd/KAIxpTd4hpuyicEQSZmIaSKvsujP0SBDy9KjIWxWHvI0a0Z7M5Ubrdm64Qa0jI1V6FOylDuNVS+Yp9c7osfKxnV7z21hhFMLPPWI4nJPeYe2Pl9zYTyW7aUvJrhXpNmXZCJykPV5hYHaImGeCStWQ1LY= 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 1787549441043131.20986220802104; Sun, 23 Aug 2026 22:30:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFw-0001YH-LC; Mon, 24 Aug 2026 01:30: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 1wyNFY-0000sm-8y for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:36 -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 1wyNFV-0006lk-0z for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:36 -0400 Received: from mx-prod-mc-05.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-515-_4MvdEwUMi-UjGNstlALkw-1; Mon, 24 Aug 2026 01:29:25 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0E17D1945CA7; Mon, 24 Aug 2026 05:29:24 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 090ED1800348; Mon, 24 Aug 2026 05:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549372; 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=g3XbYUZgnbchzQXP9HZa6yXxYah/vFREvl8Yw5CQ6l8=; b=Qz2G79NBYhIs6EzxeTWlw6wx6U0qFTtRIJflfowl5ZoN1jJ5YT2JaU9TSpPQBGKsffOdUZ TFKrrUk4qWVKopx7Hf9na2eVJ28RWrCi61V2c417LZRPaSSzPvkQ+a+lL+N+i5WoRpALrB 5lnbeQg0rfZeVaGmVPH278n/XfpO+1w= X-MC-Unique: _4MvdEwUMi-UjGNstlALkw-1 X-Mimecast-MFC-AGG-ID: _4MvdEwUMi-UjGNstlALkw_1787549364 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 05/12] python: upgrade to Python3.12+ Date: Mon, 24 Aug 2026 01:28:51 -0400 Message-ID: <20260824052859.880475-6-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549441619158500 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: Marc-Andr=C3=A9 Lureau ------------------------------------------------------------------------- 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 | 58 +++------------------------------------- python/setup.cfg | 17 +++++------- python/tests/minreqs.txt | 41 +++++++++++++--------------- pythondeps.toml | 9 +++---- 6 files changed, 42 insertions(+), 104 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..d95eeee3d23 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,11 @@ 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 + return tomllib.loads(contents) =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 22:14:53 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=1787549385; cv=none; d=zohomail.com; s=zohoarc; b=dpAZxXWsVkRo+hegKWjJGTb6angsWzMkqh511iZAbT8eUQg/HRSmxr/9aCIR4uQtPIMfjI/bdRPZZmOQBghFKWgMscJVrpLynseINO6RSPES9Tt4GVNE3Vi1CRxrpCuerE3P7YFtCtNo1Xf0uZUQTh64isO1/Xqi8SiHHLU3t+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549385; 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=ohHtIbsyCjF+i8IJpo24XrVxsgv8su0pd40YI9X52sI=; b=f8bH3i0/H/ri9uduVbmX4K3fU+7gCw0AjFEMnQCjeGezigNdNdKtNoJ0SyF0Q26e6yt6N+8nf7GKGhR9fgEvXzGCOG7FC1n29iV0yWM+ZEIraZr/JuyN+rib1zC3DuKA0p3urNymrCxU70uas1Dnix7I3SNmREH/VfDM6aV/SCk= 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 1787549385086561.8473089915557; Sun, 23 Aug 2026 22:29:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFY-0000ta-Q4; Mon, 24 Aug 2026 01:29:36 -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 1wyNFW-0000o3-3f for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:34 -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 1wyNFU-0006ld-Jd for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:33 -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-631-Zq-nB6KaOxO5R6TapzfRzw-1; Mon, 24 Aug 2026 01:29:30 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 58A7719540D4; Mon, 24 Aug 2026 05:29:28 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BE4E11800577; Mon, 24 Aug 2026 05:29:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549371; 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=ohHtIbsyCjF+i8IJpo24XrVxsgv8su0pd40YI9X52sI=; b=T3AHKwANdoVFUAefTzMgPd7GWMsBEQAsXMmk/XndrGT+xSqmHS1xnt1Xeb3GALOpq4JEv8 mvlcsDORUsyN3u5T5iWWMLx3cM7PqVjkrV4+noyyB6qDTRPmzGacFHxqOh7haA3fycxlzI 3Jv7Gy9bwkzJi5kPGkr6KYdazx14x3Q= X-MC-Unique: Zq-nB6KaOxO5R6TapzfRzw-1 X-Mimecast-MFC-AGG-ID: Zq-nB6KaOxO5R6TapzfRzw_1787549368 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 06/12] python: fix license configuration Date: Mon, 24 Aug 2026 01:28:52 -0400 Message-ID: <20260824052859.880475-7-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549387783158500 Content-Type: text/plain; charset="utf-8" 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 22:14:53 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=1787549407; cv=none; d=zohomail.com; s=zohoarc; b=NC48HmN0PQWbBgpSy3wvU0vlPUpEpxyRwvm8ImPs3HaGKIrxr09bW8oaA/kvYkQmxJeLo6aASCl50Z8AbyLCS5Yi8Zu82/998xprMtS+RoPOU++fSkdCrJx9TZsr5I7Sca0fKaH8eYQ+HuKeVA+INMRbopidFdNN1Y6mRC89sy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549407; 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=v8202GBZxiqOwWJvS181x7wJED+WVeFWB8g0Kiw4i+o=; b=E4myvP1c7DFVj63FDheKEYzJfXEm5lfofpqXdrH9FwZrNVjJLhkQZtYb7/KsKFRjyDXuTmVIOqTKBgPMxGXlFhjLfNuPJxCFM4mGx0lqAsZi+bDfbpr2DjkObGCwV6kphcJMRNO4v7PEyKPef5dLvgxPhznyGmOVye8hvVT29CA= 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 1787549407926679.3308043119398; Sun, 23 Aug 2026 22:30:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFv-0001P0-Kz; Mon, 24 Aug 2026 01:29:59 -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 1wyNFc-0000yW-JS for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:41 -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 1wyNFa-0006mG-Nb for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:40 -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-613-qT-4plHSMmedkG1Y_C_dqA-1; Mon, 24 Aug 2026 01:29:34 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 2ED7A180ACC6; Mon, 24 Aug 2026 05:29:32 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D39E31800348; Mon, 24 Aug 2026 05:29:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549378; 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=v8202GBZxiqOwWJvS181x7wJED+WVeFWB8g0Kiw4i+o=; b=D6iTfzM0ULiBzsmONutZ0I5f4yXgQ36B29+ARnGmAJqFSt7lbgwjrkTKa/EPpSaHEwqcmc rzqzrvlCLDYUFNcgWUlz9QzGlfxNc8jKUBULDSWrWhLMC1Fp+78NIIU3H99hjkQzadeWUU EeYQkmyE/xwieHWtgGoYVGwUUk3rIyU= X-MC-Unique: qT-4plHSMmedkG1Y_C_dqA-1 X-Mimecast-MFC-AGG-ID: qT-4plHSMmedkG1Y_C_dqA_1787549372 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 07/12] python: allow mypy to run as the current python version Date: Mon, 24 Aug 2026 01:28:53 -0400 Message-ID: <20260824052859.880475-8-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549409461158500 Content-Type: text/plain; charset="utf-8" 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 22:14:53 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=1787549430; cv=none; d=zohomail.com; s=zohoarc; b=QftmGUpb37N49VNTVmTJ7yXhQlxaQRqBic81Glwlf2S/L9/21pxRMN81YL847R9iVGiKh2GFnl3V1/0srFaR9uTABExFRjjq6uMdir98Uv8HShtXBiqk0AQHxA35jfjQ8ldtdhJBCBet+58MQkDDWNPWv4rNvA9w8OyxQlBqhQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549430; 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=Di2hpcygUuJ5yjO7yGEpEhxV+Li+H99aZaHHN2hOp7Q=; b=guXnhIg+0KC2RtdNu/WyNRm9ZpprieMiZ1FlDDOvbrnCYAL8j+Enl/4RPIjYQbhBatfkHI8QDVA7j5NBNQ9bYQg+8eyXxDdeu1DEt3MFKEo3Swzb1bhSC5h6+ugkQpF2lZfr1qsqF+hIPAvEiPfNh+O7qE897mRk9Wbo3E9bNNs= 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 1787549430255275.26027536800416; Sun, 23 Aug 2026 22:30:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFy-0001kP-0x; Mon, 24 Aug 2026 01:30:02 -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 1wyNFf-0000zi-OW for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:45 -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 1wyNFe-0006mh-0H for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:43 -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-641-1q-dYg9KMwibNkUS94Qvig-1; Mon, 24 Aug 2026 01:29:37 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 CEB9B180ABE7; Mon, 24 Aug 2026 05:29:35 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 985961800348; Mon, 24 Aug 2026 05:29:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549381; 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=Di2hpcygUuJ5yjO7yGEpEhxV+Li+H99aZaHHN2hOp7Q=; b=TbGrW+YVkNwVr1kllETCH4uqw0UoZzhsdJbsD8s9uTOvexK9aUjxVq3E1Ou9b6+BBYhiRi Byl95HdP06IWNWBjStV8Ccpwak+nREFmhFEo8rqfPVBjtkXWe42K2h/UPS6l7Hd2GWnXOI UZoQt90awdTikEH4PPTC8EEDAZsic0E= X-MC-Unique: 1q-dYg9KMwibNkUS94Qvig-1 X-Mimecast-MFC-AGG-ID: 1q-dYg9KMwibNkUS94Qvig_1787549376 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/12] python: remove distutils workarounds Date: Mon, 24 Aug 2026 01:28:54 -0400 Message-ID: <20260824052859.880475-9-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549431409158500 Content-Type: text/plain; charset="utf-8" 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 22:14:53 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=1787549445; cv=none; d=zohomail.com; s=zohoarc; b=MAc+dgejIDrurUOvRxbXRB6/5tIU/X4cFJZyTzInN3UUxwynaS1oYZuUjSQIggdwRzx2+CvP8Qxi/hgHZAqjhhX+NPwuudguxpnFPjphznhngmLvb8jp4kfckM4rEyrt2MxWbIg1BCDc7LhTIsowNpJ8l10rAIfBCLcz14Onbyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549445; 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=hEs5FEz2WGSi4iO3MtbQjI6pGXnjbXGTJo/QlNI5J20=; b=bmobbg3mEJsGAk2hMvn4Ah45BGvbaXDAIed3qdItx/iowlMOi8HUQdB5wSisKt5uDv3AG08dcIv8Bw0QGvVBNgjBgIpyilS+qRkm0Z5RofA1JBcXSJALRFttlcAqgwTNzWZe+sb66Zx0zSoUsql5Joo+sDp6XyAZNOmqsZmCw6M= 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 1787549445116913.2477568838701; Sun, 23 Aug 2026 22:30:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFw-0001ZE-QX; Mon, 24 Aug 2026 01:30: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 1wyNFj-0001CL-Ot for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29: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 1wyNFi-0006n8-D2 for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:47 -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-404-lu46PNbbPJa6oRz9pDMEyw-1; Mon, 24 Aug 2026 01:29:41 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 4FE0D182A112; Mon, 24 Aug 2026 05:29:40 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4E5A21800577; Mon, 24 Aug 2026 05:29:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549385; 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=hEs5FEz2WGSi4iO3MtbQjI6pGXnjbXGTJo/QlNI5J20=; b=Xn+9KzBetU6e3JVORVjdmHpfLac9K1oAOUHSIzm4fhJ2E+hpiTJ32w1u6scD050zkNxcvS BGuOU4YhE23X3PgPvNtrjafO3+A5fpvStKU6E5Lp1DFWQ4hMUd91veJ6u2FO7k4tENoUgy UDEqCA+CpvTXztVjx4gJIQAK4+8QCrk= X-MC-Unique: lu46PNbbPJa6oRz9pDMEyw-1 X-Mimecast-MFC-AGG-ID: lu46PNbbPJa6oRz9pDMEyw_1787549380 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 09/12] python: remove stale setup.cfg options Date: Mon, 24 Aug 2026 01:28:55 -0400 Message-ID: <20260824052859.880475-10-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: 1787549445572158500 Content-Type: text/plain; charset="utf-8" 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 22:14:53 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=1787549417; cv=none; d=zohomail.com; s=zohoarc; b=UWgVnib/y+0fSikO25VodceklMdXRobxHNFXu0XshWDNf2bXsyhzzzml5o7Aj6rxvxFC8CQmZCqjaAqdRmHe/qCWzTvUdUgHI0EcvsM/YgDJEqE5tJcAfV+pN6fM4TI7hqLXTaVb1RTtWNISGnlcnPXEyEjI2Bhy5ow/x+wXRMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549417; 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=xQBxgguTk8og/3EgPgo+BeQOhwuulR6uouJ3UXzYXxA=; b=nVMceZgVB5nCNPKQ2RhqlwS9zajBZ9S5yyAe/GXkxSEeGizhfX94+jXr0Uzu0YRl5BkQ9MuxaHE7YC3u/bwFAc+I7xpTyILsLi/ncIZdbpue2Wk17lLRQn+m6PQ3RKf9+hmgQ9WVnSqZuNgGr5C3AqaYD0YP1QcSKkB+gWUaJcA= 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 1787549417590827.2657880312179; Sun, 23 Aug 2026 22:30:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNFz-0001xM-Ml; Mon, 24 Aug 2026 01:30: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 1wyNFo-0001IZ-3b for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29: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 1wyNFm-0006nj-FH for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:51 -0400 Received: from mx-prod-mc-05.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-223-TKI1udwUOyCrHbVGEk_ZEw-1; Mon, 24 Aug 2026 01:29:45 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A2B2B1964CC5; Mon, 24 Aug 2026 05:29:43 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E07571800577; Mon, 24 Aug 2026 05:29:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549389; 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=xQBxgguTk8og/3EgPgo+BeQOhwuulR6uouJ3UXzYXxA=; b=dahFpsIxi4jYyNbwi8z7IXRkHReW9Mt/7cSMryv4nkut6Cubwra+57hJ1YUQ1gP1l0vKH7 HbSEjFmkq1KkQzEvTlGhrtFGvk714yBUgB3hm25ybqxo08xn+n/7pq275UgrOy4831pQSA 7CG8Osetjkn0qgmBxal5A7XzN17ZEqw= X-MC-Unique: TKI1udwUOyCrHbVGEk_ZEw-1 X-Mimecast-MFC-AGG-ID: TKI1udwUOyCrHbVGEk_ZEw_1787549383 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 10/12] sphinx: require sphinx 7.2.6 Date: Mon, 24 Aug 2026 01:28:56 -0400 Message-ID: <20260824052859.880475-11-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549419735158500 Content-Type: text/plain; charset="utf-8" Make the extraordinary leap from Sphinx 3.4.3 to Sphinx 7.2.6. Simplifications and cleanup will follow in subsequent patches. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/conf.py | 4 ++-- python/setup.cfg | 2 +- python/tests/minreqs.txt | 29 ++++++++++++++++------------- pythondeps.toml | 4 ++-- 4 files changed, 21 insertions(+), 18 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/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 22:14:53 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=1787549424; cv=none; d=zohomail.com; s=zohoarc; b=Y4+CTLYJl9MvnWoQ5Zr+ILbpWbSK6aToqFZDM6YpH0DVieIjkrUkIPTqmdj5V5/FrTlNC3UbBn8V4j17kigmU3Wy0fZ3YrnzBrGg6ztKDbmIKhFqOjE2y0UYmG09ppqsD+HqDjd4FAlyG6gKD9+CLN/U+3lpSE02bS3ZaDDEWcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549424; 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=WZuA4dY4o4EcoPwCnf6teMBJrhfjaSs6uR7NVVyPmmQ=; b=ULdsRDAHD0skFymSEd6htkK7IYjhiZNEfXvtVDxwAgdI4tTUSQSYelA+78OKKGcBryBHXn8xB6yX3xY+yVpoo9Vql6GHojDx7OictCYY++HMYGMoeUPjwdpK0j99FqCteBQz6kQ3ZQm96askNOriuiLiJRUgGTu6DAnBQCgefic= 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 178754942489474.75093962775384; Sun, 23 Aug 2026 22:30:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNG2-00029f-4C; Mon, 24 Aug 2026 01:30: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 1wyNFs-0001O8-0v for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:58 -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 1wyNFq-0006pF-AJ for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:29:55 -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-74-crQw_x9pOcWdq7c77BPLVg-1; Mon, 24 Aug 2026 01:29:49 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 C182C195DE12; Mon, 24 Aug 2026 05:29:47 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F31F91800577; Mon, 24 Aug 2026 05:29:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549393; 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=WZuA4dY4o4EcoPwCnf6teMBJrhfjaSs6uR7NVVyPmmQ=; b=fa7VyYgQ63Bd+SUD87ElFbejd8HjZnKrs9zJ14soINmGr3If1RqZhgoNKlYFxJRmSfDBgP reioMvkFYWCq9peqVFDveIEQVgocomXGDZ6Nnq3ZpdtJ8hmZWXHtGA29UvMhQkBrjRNjGu T4AXTalJaZe1O4cyDovvMccYDnVIKQE= X-MC-Unique: crQw_x9pOcWdq7c77BPLVg-1 X-Mimecast-MFC-AGG-ID: crQw_x9pOcWdq7c77BPLVg_1787549387 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 11/12] sphinx: drop fakedbusdoc Date: Mon, 24 Aug 2026 01:28:57 -0400 Message-ID: <20260824052859.880475-12-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-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.4.1 on 10.30.177.93 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.01, RCVD_IN_MSPIKE_WL=-0.01, 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: 1787549425420158500 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 22:14:53 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=1787549430; cv=none; d=zohomail.com; s=zohoarc; b=KKOjrb46Wm/RUmJ9+w7DZIOMoXSKYhyYC2n2WkXEC0XX9dxfAdZ2fjhSByU9guQgkKpQXkJ5NWG9QdsTqkr4zBc1X6wU4CLU+93wM8TSeDC7PHNA93vqk8OETRx96z/5zaNJKCMOeeacVOK+afpGRFwNo7IXdm4CgaiCz2gphRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787549430; 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=6Uh/V3Gx/CSvxWKpNQHBzUVmP5bklH9HA16RHbr+33A=; b=bbABEB90qj6rg5VCVXfKOU1O5bSnDlIPHkDtRUNMxOI1WPh6rh0zTpgTNZQdSm5Jshryps0IgE3G3jRsPzQFdJM0h8ccZ9/OYjZDHwpcB20M34H7alnR7Bs7JZEpdl0bMap12KfhmQaEQJkdQ5hYJfZ3eyavzIHVAMTZCH4cefw= 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 1787549430905103.48213188217403; Sun, 23 Aug 2026 22:30:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wyNG3-0002JA-LW; Mon, 24 Aug 2026 01:30:07 -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 1wyNFy-0001tT-Sz for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:30:03 -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 1wyNFw-0006qU-7e for qemu-devel@nongnu.org; Mon, 24 Aug 2026 01:30:02 -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-49-kVxoD1zfMjm79aomkoTQZw-1; Mon, 24 Aug 2026 01:29:52 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 14FB3195DBAE; Mon, 24 Aug 2026 05:29:51 +0000 (UTC) Received: from jsnow-thinkpadp16vgen1.westford.csb (unknown [10.22.80.29]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E61461800348; Mon, 24 Aug 2026 05:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787549398; 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=6Uh/V3Gx/CSvxWKpNQHBzUVmP5bklH9HA16RHbr+33A=; b=cV6Zn64pYkl/gQu1J7VU5nPEGr9LA437L2h4tOIYPwhAuHWFeHoPSEGFrA2qDbKP3ZFDMB kNaD0jsSK/gdGsDc8wIsMPIR9IGv6BSQz1seanoz9mNJNe/6qt4DvbAMLHncO6dZKtJEx6 FpC0mDDorBmaDCCRE7fun/X4zsd6fiI= X-MC-Unique: kVxoD1zfMjm79aomkoTQZw-1 X-Mimecast-MFC-AGG-ID: kVxoD1zfMjm79aomkoTQZw_1787549391 From: John Snow To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Kohei Tokunaga , Peter Maydell , Michael Roth , Markus Armbruster , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mauro Carvalho Chehab , Cleber Rosa , Pierrick Bouvier , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 12/12] sphinx: drop qapidoc back-compat overboiled spaghetti dinner Date: Mon, 24 Aug 2026 01:28:58 -0400 Message-ID: <20260824052859.880475-13-jsnow@redhat.com> In-Reply-To: <20260824052859.880475-1-jsnow@redhat.com> References: <20260824052859.880475-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 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.01, 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: 1787549431510158500 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: John Snow Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/sphinx/compat.py | 230 ------------------------------------- docs/sphinx/qapi_domain.py | 47 ++++---- 2 files changed, 22 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..e8bae5587fb 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,11 @@ def _validate_field(self, field: nodes.field) -> None: ) logger.warning(msg, location=3Dfield) =20 - def transform_content(self, content_node: addnodes.desc_content) -> No= ne: + def transform_content( + self, + # pylint: disable=3Darguments-renamed + content_node: addnodes.desc_content + ) -> None: # This hook runs after before_content and the nested parse, but # before the DocFieldTransformer is executed. super().transform_content(content_node) @@ -485,7 +482,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 +515,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 +530,7 @@ class QAPICommand(QAPIObject): can_collapse=3DTrue, ), # :return-nodesc: TypeName - CompatField( + docfields.Field( "returnvalue", label=3D_("Return"), names=3D("return-nodesc",), @@ -551,7 +548,7 @@ class QAPIEnum(QAPIObject): doc_field_types.extend( [ # :value name: descr - CompatGroupedField( + docfields.GroupedField( "value", label=3D_("Values"), names=3D("value",), @@ -568,7 +565,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