From 0044f3bec007cd34c84a22091ea8a9a155be34b7 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 27 Jul 2026 15:43:35 -0700 Subject: [PATCH] Remove ./tools/scons/ from ruff exclusion list. NFC --- pyproject.toml | 1 - .../site_scons/site_tools/emscripten/__init__.py | 3 ++- .../site_scons/site_tools/emscripten/emscripten.py | 13 +++++-------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 992f2ce9a5707..d55c2bf5d324d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,6 @@ exclude = [ "./test/third_party/", "./third_party/", "./tools/filelock.py", - "./tools/scons/", ".git", ] diff --git a/tools/scons/site_scons/site_tools/emscripten/__init__.py b/tools/scons/site_scons/site_tools/emscripten/__init__.py index 74c77be792021..9130de4c2a389 100644 --- a/tools/scons/site_scons/site_tools/emscripten/__init__.py +++ b/tools/scons/site_scons/site_tools/emscripten/__init__.py @@ -4,4 +4,5 @@ # University of Illinois/NCSA Open Source License. Both these licenses can be # found in the LICENSE file. -from .emscripten import exists, generate +from .emscripten import exists as exists +from .emscripten import generate as generate diff --git a/tools/scons/site_scons/site_tools/emscripten/emscripten.py b/tools/scons/site_scons/site_tools/emscripten/emscripten.py index 4687f57777255..f69d60e915e07 100644 --- a/tools/scons/site_scons/site_tools/emscripten/emscripten.py +++ b/tools/scons/site_scons/site_tools/emscripten/emscripten.py @@ -4,7 +4,6 @@ # University of Illinois/NCSA Open Source License. Both these licenses can be # found in the LICENSE file. -from __future__ import print_function import os @@ -15,9 +14,8 @@ def path_to_bin(emscripten_root, bin_name): return os.path.join(emscripten_root, bin_name) -def generate(env, **kw): - """ SCons tool entry point """ - +def generate(env, **_kw): + """SCons tool entry point.""" # SCons does not by default invoke the compiler with the # environment variables from the parent calling process, # so manually route all environment variables referenced @@ -41,9 +39,8 @@ def generate(env, **kw): if var in os.environ: env['ENV'][var] = os.environ[var] - for var in pkg_config_vars: + for var, real_key in pkg_config_vars.items(): if var in os.environ: - real_key = pkg_config_vars[var] env['ENV'][real_key] = os.environ[var] # Binary paths will be constructed from here if available. @@ -64,6 +61,6 @@ def generate(env, **kw): env.Replace(PROGSUFFIX='.js') -def exists(env): - """ NOOP method required by SCons """ +def exists(_env): + """NOOP method required by SCons.""" return 1