From nobody Mon Nov 25 00:48:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1719444243; cv=none; d=zohomail.com; s=zohoarc; b=fWY84zGuG2VMENvGhpGkS8WuqmLfcldMZZawidP0SVwRYMDRs4wUMlu6NP4jtGSY61N0GqSg1jkSWzjM4NVLDA+AEADi4TWqyS2EmYAQKIzsWz87miamoEYcqXBKd0A2ph1SJM0P8X874KdZQeEMTfQ1icJbSDQC5XyyJyxGMNs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719444243; 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=jfQJxByF537maeh28QrLuBFXZ6VbAkdiEnJmU2XF764=; b=cMcemifpOMLFLZ13d+XW4oXvNhzVS317zTbU127F9cyg1cHDFC/lCtwEvjAFIPlx7aIETmN7de622j/P9X446jEEM8EW7cPpZUznXlIcFgNBRpwB7Y6l6Vh4BV41D0C77INJ7t8O/1n3IqOK28DnqOqAsrlbLuD4RvYG5qlGBlc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1719444243229430.28581802436463; Wed, 26 Jun 2024 16:24:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMbyc-0000e6-Cu; Wed, 26 Jun 2024 19:22:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMbyS-0000bu-Hs for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:22: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 1sMbyQ-0002o3-P0 for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:22:48 -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-484-nD3S8_iuN0uSaecsajQtgg-1; Wed, 26 Jun 2024 19:22:42 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 41D4519560AA; Wed, 26 Jun 2024 23:22:41 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.58]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9E0AE1956087; Wed, 26 Jun 2024 23:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719444165; 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=jfQJxByF537maeh28QrLuBFXZ6VbAkdiEnJmU2XF764=; b=BUwnoeQBQoNCyuIjlwugWG8QP6LoKEqd46gXJ7ActzhLurDT78yU4HTt/iRdqqO5faQudU cv4oPcErhaUq4C/XnYvVdDHomxNnmAWnp8ePz+UO6NyFDqL3tLdCQSGW6ocpzVKpa4foYU gH6lUwWqdHLdIyfDl2t8O5Re6GVft4Q= X-MC-Unique: nD3S8_iuN0uSaecsajQtgg-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , John Snow , Kevin Wolf , Beraldo Leal , Thomas Huth , Hanna Reitz Subject: [PATCH 1/4] python: linter changes for pylint 3.x Date: Wed, 26 Jun 2024 19:22:27 -0400 Message-ID: <20240626232230.408004-2-jsnow@redhat.com> In-Reply-To: <20240626232230.408004-1-jsnow@redhat.com> References: <20240626232230.408004-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.207, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1719444243886100001 Content-Type: text/plain; charset="utf-8" New bleeding edge versions, new nits to iron out. This addresses the 'check-python-tox' optional GitLab test, while 'check-python-minreqs' saw no regressions, since it's frozen on an older version of pylint. Fixes: qemu/machine/machine.py:345:52: E0606: Possibly using variable 'sock' befor= e assignment (possibly-used-before-assignment) qemu/utils/qemu_ga_client.py:168:4: R1711: Useless return at end of functio= n or method (useless-return) Signed-off-by: John Snow Reviewed-by: Alex Benn=C3=A9e --- python/qemu/machine/machine.py | 1 + python/qemu/utils/qemu_ga_client.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index f648f6af451..ebb58d5b68c 100644 --- a/python/qemu/machine/machine.py +++ b/python/qemu/machine/machine.py @@ -335,6 +335,7 @@ def binary(self) -> str: =20 def _pre_launch(self) -> None: if self._qmp_set: + sock =3D None if self._monitor_address is None: self._sock_pair =3D socket.socketpair() os.set_inheritable(self._sock_pair[0].fileno(), True) diff --git a/python/qemu/utils/qemu_ga_client.py b/python/qemu/utils/qemu_g= a_client.py index 9a665e6e990..cf0fcf9a8bb 100644 --- a/python/qemu/utils/qemu_ga_client.py +++ b/python/qemu/utils/qemu_ga_client.py @@ -174,7 +174,7 @@ def suspend(self, mode: str) -> None: # On error exception will raise except asyncio.TimeoutError: # On success command will timed out - return + pass =20 def shutdown(self, mode: str =3D 'powerdown') -> None: if mode not in ['powerdown', 'halt', 'reboot']: --=20 2.45.0 From nobody Mon Nov 25 00:48:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1719444260; cv=none; d=zohomail.com; s=zohoarc; b=UffbwaVdI3GL2vTOfo0fb5SJrjGX7LdPjeZuf7qVO5umNcSBE5+MT+BX0uJnfVAs7aCz48bXqmJLJe0893M9Sc5575CZ/wYeJFCDyamFhubQa3kwyEO+Sw4iqs00X3qfD4HNi/0RnkCuerXZUzVQ5O3BROE45L3Yk8SmSfYISmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719444260; 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=+m/PtTqCXe317JzOr7YTPOeNwPfLa3iGg5Bw2RMLDFY=; b=IQksG6VX1KoHGBkJMmEWXE9QBHBre1KFeHGNawhIqR7bX/1aJn8mySxTmFsQ1tcxzYoECwMT9lEq7NjoEAKeIqSQV0mvYbnHdLq77yLm5VoPNY+CQBbJKEkznlVnAiDCKjUoF1NFdLRArSSLnPa13vN3ZmczGEXI70p0Gvb+VzI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1719444260265851.9069485482298; Wed, 26 Jun 2024 16:24:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMbya-0000dr-Ei; Wed, 26 Jun 2024 19:22:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMbyT-0000cN-Tk for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:22:52 -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 1sMbyS-0002on-Bb for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:22:49 -0400 Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-5-SXi7aS7ONWyqyCLp0HMnXg-1; Wed, 26 Jun 2024 19:22:45 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 38BC119560A7; Wed, 26 Jun 2024 23:22:44 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.58]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7668C1956087; Wed, 26 Jun 2024 23:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719444167; 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=+m/PtTqCXe317JzOr7YTPOeNwPfLa3iGg5Bw2RMLDFY=; b=Nfp/WBYnXAuH5o/oU0pYHW2MYRWrWg6WlLKXFPfudJ7WhJOg6CzSGGZhc9iLzo2pLzt2T6 myQnguuWVKpQLRNuidD54x7OlqnZ5EN0dRDer66hrz5Xsnu4vC3uwKfztedST43BtCEQhn nnocPu0s+luUsDP/n/bgP8g3HRdRqT8= X-MC-Unique: SXi7aS7ONWyqyCLp0HMnXg-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , John Snow , Kevin Wolf , Beraldo Leal , Thomas Huth , Hanna Reitz Subject: [PATCH 2/4] python: Do not use pylint 3.2.4 with python 3.8 Date: Wed, 26 Jun 2024 19:22:28 -0400 Message-ID: <20240626232230.408004-3-jsnow@redhat.com> In-Reply-To: <20240626232230.408004-1-jsnow@redhat.com> References: <20240626232230.408004-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.207, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1719444261821100001 Content-Type: text/plain; charset="utf-8" There is a bug in this version, see: https://github.com/pylint-dev/pylint/issues/9751 Signed-off-by: John Snow Reviewed-by: Alex Benn=C3=A9e --- python/setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/python/setup.cfg b/python/setup.cfg index 48668609d3e..8ebd345d7ed 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -41,6 +41,7 @@ devel =3D isort >=3D 5.1.2 mypy >=3D 1.4.0 pylint >=3D 2.17.3 + pylint !=3D 3.2.4; python_version<"3.9" tox >=3D 3.18.0 urwid >=3D 2.1.2 urwid-readline >=3D 0.13 --=20 2.45.0 From nobody Mon Nov 25 00:48:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1719444244; cv=none; d=zohomail.com; s=zohoarc; b=XxS4AJCIX36gDnqQHdSCkTd4NWWQTZV3NXTtzhalSxwB7uRyvDmRGyB6WA4bW4kD1CxKN2OkIAb8UR9dxi3A4+S7GcAEzCMwsRONetZbx2LKdlMzc4A1DZNL6YqYAJfGbQ+ddkNFnTlK2pOwT8xJytpNI9Eh560cvDVeWQyqY9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719444244; 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=QXnieYXmBiBT140D1yWQStaAtYrvr8Ze4CKBLC3cBsg=; b=UoW9vd0jSboYGUopAUMMTS16OrnKnqRz47rexi+x1q1UZh+kK9Mquent0XEhqR2I0Fo0p2OzkRBnfuaZRQljM7DsdYvJoDpyI2YogVL0RD2gParzpUEr5wsP/aD3qiptLD75F9V1SyfMu6Izvz8Bj0sGcVYOjS7TO784LewErT4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1719444244896495.39896362409456; Wed, 26 Jun 2024 16:24:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMbyk-0000i2-Oz; Wed, 26 Jun 2024 19:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMbyc-0000eh-Q1 for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:23:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMbyZ-0002qW-S5 for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:22:57 -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-113-AlG6fPNKNredV7WJE-XCjQ-1; Wed, 26 Jun 2024 19:22:50 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 BC8F11955F0D; Wed, 26 Jun 2024 23:22:47 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.58]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 8BD1C19560AB; Wed, 26 Jun 2024 23:22:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719444174; 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=QXnieYXmBiBT140D1yWQStaAtYrvr8Ze4CKBLC3cBsg=; b=CTDA/+Z8pjB5FmRHRzERYT7WYfMi1H4eX3SCK7hFJ1iFhKDovte7ruNp3254dp0H0h1Zzx 74eQWSxjRcRelZOdH6hRanXvFQAPN5WX82WsAaq0j1YFN/asEnAcxy2C13Q/FUHWxoVcSw 7kTHOC9MKR5a2HOr5vAw12Y8OYJU69c= X-MC-Unique: AlG6fPNKNredV7WJE-XCjQ-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , John Snow , Kevin Wolf , Beraldo Leal , Thomas Huth , Hanna Reitz Subject: [PATCH 3/4] iotests: Change imports for Python 3.13 Date: Wed, 26 Jun 2024 19:22:29 -0400 Message-ID: <20240626232230.408004-4-jsnow@redhat.com> In-Reply-To: <20240626232230.408004-1-jsnow@redhat.com> References: <20240626232230.408004-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.207, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1719444245747100009 Content-Type: text/plain; charset="utf-8" Python 3.13 isn't out yet, but it's in beta and Fedora is ramping up to make it the default system interpreter for Fedora 41. They moved our cheese for where ContextManager lives; add a conditional to locate it while we support both pre-3.9 and 3.13+. Signed-off-by: John Snow --- tests/qemu-iotests/testenv.py | 7 ++++++- tests/qemu-iotests/testrunner.py | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py index 588f30a4f14..96d69e56963 100644 --- a/tests/qemu-iotests/testenv.py +++ b/tests/qemu-iotests/testenv.py @@ -25,7 +25,12 @@ import random import subprocess import glob -from typing import List, Dict, Any, Optional, ContextManager +from typing import List, Dict, Any, Optional + +if sys.version_info >=3D (3, 9): + from contextlib import AbstractContextManager as ContextManager +else: + from typing import ContextManager =20 DEF_GDB_OPTIONS =3D 'localhost:12345' =20 diff --git a/tests/qemu-iotests/testrunner.py b/tests/qemu-iotests/testrunn= er.py index 7b322272e92..2e236c8fa39 100644 --- a/tests/qemu-iotests/testrunner.py +++ b/tests/qemu-iotests/testrunner.py @@ -27,11 +27,14 @@ import shutil import sys from multiprocessing import Pool -from typing import List, Optional, Any, Sequence, Dict, \ - ContextManager - +from typing import List, Optional, Any, Sequence, Dict from testenv import TestEnv =20 +if sys.version_info >=3D (3, 9): + from contextlib import AbstractContextManager as ContextManager +else: + from typing import ContextManager + =20 def silent_unlink(path: Path) -> None: try: --=20 2.45.0 From nobody Mon Nov 25 00:48:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1719444248; cv=none; d=zohomail.com; s=zohoarc; b=HsP4cZTMcoRW5XGzrAtb+fFmtYbEr7y2LhM0ZDaPoQtAr4B9t9Hw1n0+XAtkRDJM3MsNvzTcia0V2QgAju7v9e5g9EnLIEG2rCSweEtWin7K6izvpgr3RMIMQl80T1hG/O/TtlIKqpZpFcb41MxSj7oXsYGxgzlA3wes+zHImP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719444248; 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=W+eDYLKObbqVZItP4vjcUn2O11vardm1aMAh3d5puPI=; b=TQjwZtlF9PTwyE/3sGC+RXwluGA7m7VV5nva1e4F8nPyDdQOJim/zi4dPTAW1cYWSJ2w0I7xd8zMMFfJH8DU1Gfi0MamOE5mfK1GK5VUjmpqXCIgfZr1VUitYjh5rWDLhkoBpN0x8brjO53p9IU88m68fWuF4ANIcNEiB8ukZBc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171944424872213.872330402289435; Wed, 26 Jun 2024 16:24:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sMbyl-0000j4-Ix; Wed, 26 Jun 2024 19:23:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMbye-0000fZ-1N for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:23: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 1sMbyc-0002qc-J1 for qemu-devel@nongnu.org; Wed, 26 Jun 2024 19:22:59 -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-539-cQft-yOSP8CfK-wBaYdxXw-1; Wed, 26 Jun 2024 19:22:51 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 276431956094; Wed, 26 Jun 2024 23:22:50 +0000 (UTC) Received: from scv.redhat.com (unknown [10.22.16.58]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EDF4D1956087; Wed, 26 Jun 2024 23:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719444175; 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=W+eDYLKObbqVZItP4vjcUn2O11vardm1aMAh3d5puPI=; b=GQybWYGzC2LTtUo00of2tM5uKObYw7rwHqT7oVbC8hz52lRuhteh1aXITrTzS2GRUWY839 ZRRvmaZpzQXtoNUMssYIwhasx7DSLaB/o/FJ8sdshdsfwRjZ7O1DG1G0DFgGH6d0BKbJfX rgqLCAGe2S+GJv48h+XMMeJXLlsO+ok= X-MC-Unique: cQft-yOSP8CfK-wBaYdxXw-1 From: John Snow To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , John Snow , Kevin Wolf , Beraldo Leal , Thomas Huth , Hanna Reitz Subject: [PATCH 4/4] python: enable testing for 3.13 Date: Wed, 26 Jun 2024 19:22:30 -0400 Message-ID: <20240626232230.408004-5-jsnow@redhat.com> In-Reply-To: <20240626232230.408004-1-jsnow@redhat.com> References: <20240626232230.408004-1-jsnow@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.207, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1719444249757100001 Content-Type: text/plain; charset="utf-8" Python 3.13 is in beta and Fedora 41 is preparing to make it the default system interpreter; enable testing for it. (In the event problems develop prior to release, it should only impact the check-python-tox job, which is not run by default and is allowed to fail.) Signed-off-by: John Snow Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e --- python/setup.cfg | 3 ++- tests/docker/dockerfiles/python.docker | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/python/setup.cfg b/python/setup.cfg index 8ebd345d7ed..3b4e2cc5501 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -19,6 +19,7 @@ classifiers =3D Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 Programming Language :: Python :: 3.12 + Programming Language :: Python :: 3.13 Typing :: Typed =20 [options] @@ -184,7 +185,7 @@ multi_line_output=3D3 # of python available on your system to run this test. =20 [tox:tox] -envlist =3D py38, py39, py310, py311, py312 +envlist =3D py38, py39, py310, py311, py312, py313 skip_missing_interpreters =3D true =20 [testenv] diff --git a/tests/docker/dockerfiles/python.docker b/tests/docker/dockerfi= les/python.docker index a3c1321190c..8f0af9ef25f 100644 --- a/tests/docker/dockerfiles/python.docker +++ b/tests/docker/dockerfiles/python.docker @@ -14,6 +14,7 @@ ENV PACKAGES \ python3.10 \ python3.11 \ python3.12 \ + python3.13 \ python3.8 \ python3.9 =20 --=20 2.45.0