public inbox for buildbot@sourceware.org
 help / color / mirror / Atom feed
From: Simon Marchi <simon.marchi@efficios.com>
To: buildbot@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 2/8] autoregen.py: fix a pyright `reportConstantRedefinition` warning
Date: Mon, 11 Mar 2024 15:01:14 -0400	[thread overview]
Message-ID: <20240311190341.235331-3-simon.marchi@efficios.com> (raw)
In-Reply-To: <20240311190341.235331-1-simon.marchi@efficios.com>

Not a big deal, and this is certainly opinionated, but pyright tells me:

    /home/smarchi/src/builder/builder/containers/autoregen.py
      /home/smarchi/src/builder/builder/containers/autoregen.py:24:1 - error: "ENV" is constant (because it is uppercase) and cannot be redefined (reportConstantRedefinition)

Switch to a syntax that avoids redefinition of the variable.
---
 builder/containers/autoregen.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 861a2ce79ef5..feee5878cac7 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -21,12 +21,15 @@ AUTOHEADER_BIN = next(name for name in autoheader_names if shutil.which(name))
 
 # autoconf-wrapper and automake-wrapper from Gentoo look at this environment variable.
 # It's harmless to set it on other systems though.
-ENV = f'WANT_AUTOCONF={AUTOCONF_BIN.split("-", 1)[1]} '
-ENV += f'WANT_AUTOMAKE={AUTOMAKE_BIN.split("-", 1)[1]} '
-
-ENV += f" AUTOCONF={AUTOCONF_BIN} "
-ENV += f" ACLOCAL={ACLOCAL_BIN} "
-ENV += f" AUTOMAKE={AUTOMAKE_BIN}"
+ENV = " ".join(
+    (
+        f'WANT_AUTOCONF={AUTOCONF_BIN.split("-", 1)[1]}',
+        f'WANT_AUTOMAKE={AUTOMAKE_BIN.split("-", 1)[1]}',
+        f"AUTOCONF={AUTOCONF_BIN}",
+        f"ACLOCAL={ACLOCAL_BIN}",
+        f"AUTOMAKE={AUTOMAKE_BIN}",
+    )
+)
 
 
 # Directories we should skip entirely because they're vendored or have different
-- 
2.44.0


  parent reply	other threads:[~2024-03-11 19:03 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-11 19:01 [PATCH 0/8] Some changes to autoregen.py Simon Marchi
2024-03-11 19:01 ` [PATCH 1/8] autoregen.py: re-format with black 24.2.0 Simon Marchi
2024-03-11 19:01 ` Simon Marchi [this message]
     [not found]   ` <871q8f7jx5.fsf@aarsen.me>
2024-03-12 16:00     ` [PATCH 2/8] autoregen.py: fix a pyright `reportConstantRedefinition` warning Simon Marchi
2024-03-13  8:58       ` Mark Wielaard
2024-03-18 17:36         ` Arsen Arsenović
2024-03-11 19:01 ` [PATCH 3/8] autoregen.py: add type annotation for config_folders Simon Marchi
2024-03-11 19:01 ` [PATCH 4/8] autoregen.py: capitalize some constant names Simon Marchi
2024-03-11 19:01 ` [PATCH 5/8] autoregen.py: add non-suffixed version of the tools Simon Marchi
2024-03-11 19:01 ` [PATCH 6/8] autoregen.py: print executed commands on stdout Simon Marchi
2024-03-11 19:01 ` [PATCH 7/8] autoregen.py: let subprocesses print to stdout/stderr Simon Marchi
     [not found]   ` <87plvz7k10.fsf@aarsen.me>
2024-03-12 15:40     ` Simon Marchi
2024-03-13  8:46       ` Mark Wielaard
2024-03-11 19:01 ` [PATCH 8/8] autoregen.py: be more verbose Simon Marchi
2024-03-11 21:04 ` [PATCH 0/8] Some changes to autoregen.py Sam James
2024-03-11 21:52   ` Mark Wielaard
2024-03-12  1:53     ` Simon Marchi
2024-03-12 10:17       ` Mark Wielaard

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=20240311190341.235331-3-simon.marchi@efficios.com \
    --to=simon.marchi@efficios.com \
    --cc=buildbot@sourceware.org \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).