From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Markus Armbruster" <armbru@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Kevin Wolf" <kwolf@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"John Snow" <jsnow@redhat.com>,
qemu-block@nongnu.org, "Hanna Reitz" <hreitz@redhat.com>
Subject: [PATCH RFC 01/10] python/mkvenv: ensure HAVE_LIB variables are actually constants
Date: Tue, 28 Oct 2025 18:03:31 -0400 [thread overview]
Message-ID: <20251028220342.1407883-2-jsnow@redhat.com> (raw)
In-Reply-To: <20251028220342.1407883-1-jsnow@redhat.com>
Pylint 4.x has refined checking for variable names that behave as
constants vs ones that do not; unfortunately our tricky import machinery
is perceived as these variables being re-assigned.
Add a temporary variable with an underscore and assign to the global
constants precisely once to alleviate this new nag message.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/scripts/mkvenv.py | 24 ++++++++++++++++--------
python/setup.cfg | 1 +
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/python/scripts/mkvenv.py b/python/scripts/mkvenv.py
index 9aed266df1b..a064709e6ce 100644
--- a/python/scripts/mkvenv.py
+++ b/python/scripts/mkvenv.py
@@ -92,7 +92,7 @@
# Try to load distlib, with a fallback to pip's vendored version.
# HAVE_DISTLIB is checked below, just-in-time, so that mkvenv does not fail
# outside the venv or before a potential call to ensurepip in checkpip().
-HAVE_DISTLIB = True
+_import_ok = True
try:
import distlib.scripts
except ImportError:
@@ -102,11 +102,13 @@
from pip._vendor import distlib
import pip._vendor.distlib.scripts # noqa, pylint: disable=unused-import
except ImportError:
- HAVE_DISTLIB = False
+ _import_ok = False
+
+HAVE_DISTLIB = _import_ok
# pip 25.2 does not vendor distlib.version, but it uses vendored
# packaging.version
-HAVE_DISTLIB_VERSION = True
+_import_ok = True
try:
import distlib.version # pylint: disable=ungrouped-imports
except ImportError:
@@ -114,9 +116,11 @@
# pylint: disable=unused-import,ungrouped-imports
import pip._vendor.distlib.version # noqa
except ImportError:
- HAVE_DISTLIB_VERSION = False
+ _import_ok = False
-HAVE_PACKAGING_VERSION = True
+HAVE_DISTLIB_VERSION = _import_ok
+
+_import_ok = True
try:
# Do not bother importing non-vendored packaging, because it is not
# in stdlib.
@@ -125,20 +129,24 @@
import pip._vendor.packaging.requirements # noqa
import pip._vendor.packaging.version # noqa
except ImportError:
- HAVE_PACKAGING_VERSION = False
+ _import_ok = False
+
+HAVE_PACKAGING_VERSION = _import_ok
# 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().
-HAVE_TOMLLIB = True
+_import_ok = True
try:
import tomllib
except ImportError:
try:
import tomli as tomllib
except ImportError:
- HAVE_TOMLLIB = False
+ _import_ok = False
+
+HAVE_TOMLLIB = _import_ok
# Do not add any mandatory dependencies from outside the stdlib:
# This script *must* be usable standalone!
diff --git a/python/setup.cfg b/python/setup.cfg
index d7f5dc7bafe..f40f11396c9 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -159,6 +159,7 @@ good-names=i,
c, # for c in string: ...
T, # for TypeVars. See pylint#3401
SocketAddrT, # Not sure why this is invalid.
+ _import_ok, # For mkvenv import trickery and compatibility pre-4.x
[pylint.similarities]
# Ignore imports when computing similarities.
--
2.51.0
next prev parent reply other threads:[~2025-10-28 22:05 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-28 22:03 [PATCH RFC 00/10] RFC: Drop qemu.qmp from qemu.git John Snow
2025-10-28 22:03 ` John Snow [this message]
2025-10-30 7:51 ` [PATCH RFC 01/10] python/mkvenv: ensure HAVE_LIB variables are actually constants Thomas Huth
2025-10-30 14:49 ` John Snow
2025-10-28 22:03 ` [PATCH RFC 02/10] python/qapi: Add an ignore for Pylint 4.x John Snow
2025-10-30 8:23 ` Thomas Huth
2025-10-30 14:50 ` John Snow
2025-10-28 22:03 ` [PATCH RFC 03/10] python/mkvenv: create timestamp file for each group "ensured" John Snow
2025-10-30 8:28 ` Thomas Huth
2025-10-30 15:12 ` John Snow
2025-10-28 22:03 ` [PATCH RFC 04/10] python/mkvenv: bump 'qemu.qmp' dependency for testdeps John Snow
2025-10-30 8:29 ` Thomas Huth
2025-10-28 22:03 ` [PATCH RFC 05/10] python/mkvenv: rename 'testdeps' to 'functests' John Snow
2025-10-30 8:30 ` Thomas Huth
2025-10-30 8:36 ` Thomas Huth
2025-10-28 22:03 ` [PATCH RFC 06/10] python/mkvenv: add "tests" dependency group John Snow
2025-10-30 8:39 ` Thomas Huth
2025-10-30 18:58 ` John Snow
2025-11-03 12:21 ` Thomas Huth
2025-10-28 22:03 ` [PATCH RFC 07/10] meson: create meson custom target for python test dependencies John Snow
2025-10-28 22:03 ` [PATCH RFC 08/10] meson: make iotests depend on pyvent_test_deps John Snow
2025-10-28 22:03 ` [PATCH RFC 09/10] python: quote dotted dependency keys John Snow
2025-10-30 8:41 ` Thomas Huth
2025-10-30 15:14 ` John Snow
2025-10-28 22:03 ` [PATCH RFC 10/10] python: delete qemu.qmp John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251028220342.1407883-2-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).