From nobody Tue Apr 7 21:45:15 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=1773242058; cv=none; d=zohomail.com; s=zohoarc; b=lEcCKahQLe+FHXENNTbep2LIOuhFgNqy61llgCdnnpjxO+KsNjMh3ZdM7L/Xop1q7zmRw+6EPV0wDGO0wGol8OBA0o1ftDAmpqa6OUKIKD68FBfa1w9yBKQUKgQec4483iyBQFznfjlnPgbNnMx0Av1X6uz0h2cGPwe6Y++99rU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773242058; 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=TuoYc3K3azKr0q3nC8TZTA5an25d+PhZxnZJ77cts6EgpzOj3sTtld02GJI5DfH2lcjv47uFzPsoeqAkrg1YGpbhbAYZixN5bJjdihDR2H3Fw1ey54hylSagICEbsjuvINb0yKVsvcfJmgM14wsqBLwDpE2cliQalgPzKXDoj3g= 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 1773242058640728.5046288923777; Wed, 11 Mar 2026 08:14:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0LBA-00071p-QC; Wed, 11 Mar 2026 11:08: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 1w0L9L-0003wy-Lz; Wed, 11 Mar 2026 11:07:06 -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 1w0L9I-0004xb-Uz; Wed, 11 Mar 2026 11:07:03 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 490CC191E88; Wed, 11 Mar 2026 18:04:41 +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 2928537C2C9; Wed, 11 Mar 2026 18:05:19 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773241481; bh=0uZ5ATjhIzDgyacoMi6E796UKRKgVRPT0yaUj1O9yhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=r5MyusYyCStSH+h2EmL0/1UmFxYTmGYCC05s0hHOdRVTkFG9KjvOr4Vq4B0r9v8g5 KwOMXWbtazWtPTeExRIKiSWeuQlPZLH5tH5HN+TkjyRpNCfmmzQt3muxhO0nm1xYsY Nk3WjRTtyEmOg4g4CZnVP04HrAtUedfpY+qUnF/89HCgeeGFOxPd2LR2GRp3cDdXNI OWrXQkfVls/TPXUZY00KU+mH7XVwEIgEhgZB/rcaazDW/zYFzy0Qq72K3MtZDYGjqp z6t4ymp198C7x3Yh3p1TtqWV7rF9kZBH2eq6HdXoyVdJ6a3cvoJVu3YFpTMFuXYSPz cG6ZoDqHe5GEg== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, John Snow , Peter Maydell , Thomas Huth , Michael Tokarev Subject: [Stable-10.1.5 05/46] python: drop uses of pkg_resources Date: Wed, 11 Mar 2026 18:02:41 +0300 Message-ID: <20260311150327.1084669-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: 1773242059681158500 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