From nobody Tue Apr 7 21:27:04 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 ARC-Seal: i=1; a=rsa-sha256; t=1773257850; cv=none; d=zohomail.com; s=zohoarc; b=RXggOvuqQC4U6XMwhwQIryST1uJMkVAWd+KDUAVBXvowpuuNVxK2GmQDJ20n/L1I1UeHi3EhIqUF4McUGBlMZxlcSpZBRsKad1vtuQh+1AwL2pB8ZvhsJjjQz5Od3WeEst4rofo8Teq/lM3qkWOX0ntt4c8IVJ3cOY1S2faPcb0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773257850; 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=okdMRNLivTqbv1+SQ1RagToGEgbaPtLSdDkoMAxfwP4=; b=jlf14nWk26zOsB5kXbKpnj2r6UcF4rquJQJsJeKQsRB7rSy6ER63UAz+Jd9A/NfxJYG3QBKvjEfq7k50+jNUV6sRCX5rZ5PzQgPyvN3IU8T60q9tqCyeyer/k/CJVUT7yzvcLMRrbDl7PE/3afCwIj6gc00AmsU/wvDM33qs4z0= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773257850149395.43713809393773; Wed, 11 Mar 2026 12:37:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0PLE-0007YD-Ar; Wed, 11 Mar 2026 15:35:36 -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 1w0PKw-0007TD-VZ; Wed, 11 Mar 2026 15:35:20 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0PKt-00005M-20; Wed, 11 Mar 2026 15:35:18 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6F6B71920ED; Wed, 11 Mar 2026 22:34:26 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id A531637C452; Wed, 11 Mar 2026 22:35:04 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773257666; bh=0uZ5ATjhIzDgyacoMi6E796UKRKgVRPT0yaUj1O9yhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G+3v5oEUBO1t6BItSW000nUgCswMiwXKw5qFOaGW5ad41zQtobeA87Dq8aH8jQQ7p 392uZYSjYmt7pF7a9Y6U74xTZACMsjMpfIccYNMLddoN6/n/HVjSD1uaCami3Va/I+ nqoDYr0JyyABbw9k2jihsaDAGFkJKzZhzzFsuPALziePzM5AiEMEvkkDnhHtFiB5gs WOa+i3AtX8Q7wCGbg26aO7RNCEHHu57MAgWdck4bNUIbOIfTb6/5shYC5P6nxYpo+t oZrAWhOQ/QijcA5gljl2kn7cm8yGVT9CSPouAleAcL0/TfmJqXjhxG2pkgFbgy8nzH AxQkRJvR6h4EA== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, John Snow , Peter Maydell , Thomas Huth , Michael Tokarev Subject: [Stable-10.2.2 05/53] python: drop uses of pkg_resources Date: Wed, 11 Mar 2026 22:33:58 +0300 Message-ID: <20260311193449.1096110-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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 @tls.msk.ru) X-ZM-MESSAGEID: 1773257852531158500 Content-Type: text/plain; charset="utf-8" From: John Snow pkg_resources has been fully dropped from modern pip/setuptools distributions and we should phase out its use. This patch is enough to, by itself, repair most GitLab CI tests upstream; with the exception of tox tests which are still making use of avocado - which will be dropped in a separate series to restore functionality there. Signed-off-by: John Snow Suggested-by: Peter Maydell Message-ID: <20260211195804.135144-3-jsnow@redhat.com> Signed-off-by: Thomas Huth (cherry picked from commit e44a26ba940214824b61976324058e73d9f41658) Signed-off-by: Michael Tokarev diff --git a/python/setup.py b/python/setup.py index c5bc45919a..789fa39b0f 100755 --- a/python/setup.py +++ b/python/setup.py @@ -7,7 +7,6 @@ import setuptools from setuptools.command import bdist_egg import sys -import pkg_resources =20 =20 class bdist_egg_guard(bdist_egg.bdist_egg): @@ -30,9 +29,6 @@ def main(): QEMU tooling installer """ =20 - # https://medium.com/@daveshawley/safely-using-setup-cfg-for-metadata-= 1babbe54c108 - pkg_resources.require('setuptools>=3D39.2') - setuptools.setup(cmdclass=3D{'bdist_egg': bdist_egg_guard}) =20 =20 --=20 2.47.3