michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: west_commands: build_helpers: Fix linter issues

Browse source 
Fix issues reported by ruff.

Signed-off-by: Pieter De Gendt <pieter.degendt@basalte.be>
This commit is contained in:
Pieter De Gendt 2025-05-24 13:19:53 +02:00 • committed by Anas Nashif
commit d9d4daa940
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.ruff-excludes.toml
View file

@ -1078,11 +1078,6 @@
"UP007", # https://docs.astral.sh/ruff/rules/non-pep604-annotation-union "UP007", # https://docs.astral.sh/ruff/rules/non-pep604-annotation-union
"UP035", # https://docs.astral.sh/ruff/rules/deprecated-import "UP035", # https://docs.astral.sh/ruff/rules/deprecated-import
] ]
"./scripts/west_commands/build_helpers.py" = [
"E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
"UP032", # https://docs.astral.sh/ruff/rules/f-string
]
"./scripts/west_commands/debug.py" = [ "./scripts/west_commands/debug.py" = [
"I001", # https://docs.astral.sh/ruff/rules/unsorted-imports "I001", # https://docs.astral.sh/ruff/rules/unsorted-imports
"UP008", # https://docs.astral.sh/ruff/rules/super-call-with-parameters "UP008", # https://docs.astral.sh/ruff/rules/super-call-with-parameters

15
scripts/west_commands/build_helpers.py
View file

@ -10,10 +10,11 @@ building Zephyr applications needed by multiple commands.
See build.py for the build command itself. See build.py for the build command itself.
''' '''
import zcmake
import os import os
import sys import sys
from pathlib import Path from pathlib import Path
import zcmake
from west import log from west import log
from west.configuration import config from west.configuration import config
from west.util import escapes_directory from west.util import escapes_directory
@ -22,7 +23,7 @@ from west.util import escapes_directory
# twister also uses the implementation # twister also uses the implementation
script_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) script_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
sys.path.insert(0, os.path.join(script_dir, "pylib/build_helpers/")) sys.path.insert(0, os.path.join(script_dir, "pylib/build_helpers/"))
from domains import Domains from domains import Domains # noqa: E402
DEFAULT_BUILD_DIR = 'build' DEFAULT_BUILD_DIR = 'build'
'''Name of the default Zephyr build directory.''' '''Name of the default Zephyr build directory.'''
@ -30,11 +31,11 @@ DEFAULT_BUILD_DIR = 'build'
DEFAULT_CMAKE_GENERATOR = 'Ninja' DEFAULT_CMAKE_GENERATOR = 'Ninja'
'''Name of the default CMake generator.''' '''Name of the default CMake generator.'''
FIND_BUILD_DIR_DESCRIPTION = '''\ FIND_BUILD_DIR_DESCRIPTION = f'''\
If the build directory is not given, the default is {}/ unless the If the build directory is not given, the default is {DEFAULT_BUILD_DIR}/ unless the
build.dir-fmt configuration variable is set. The current directory is build.dir-fmt configuration variable is set. The current directory is
checked after that. If either is a Zephyr build directory, it is used. checked after that. If either is a Zephyr build directory, it is used.
'''.format(DEFAULT_BUILD_DIR) '''
def _resolve_build_dir(fmt, guess, cwd, **kwargs): def _resolve_build_dir(fmt, guess, cwd, **kwargs):
# Remove any None values, we do not want 'None' as a string # Remove any None values, we do not want 'None' as a string
@ -100,14 +101,14 @@ def find_build_dir(dir, guess=False, **kwargs):
cwd = os.getcwd() cwd = os.getcwd()
default = config.get('build', 'dir-fmt', fallback=DEFAULT_BUILD_DIR) default = config.get('build', 'dir-fmt', fallback=DEFAULT_BUILD_DIR)
default = _resolve_build_dir(default, guess, cwd, **kwargs) default = _resolve_build_dir(default, guess, cwd, **kwargs)
log.dbg('config dir-fmt: {}'.format(default), level=log.VERBOSE_EXTREME) log.dbg(f'config dir-fmt: {default}', level=log.VERBOSE_EXTREME)
if default and is_zephyr_build(default): if default and is_zephyr_build(default):
build_dir = default build_dir = default
elif is_zephyr_build(cwd): elif is_zephyr_build(cwd):
build_dir = cwd build_dir = cwd
else: else:
build_dir = default build_dir = default
log.dbg('build dir: {}'.format(build_dir), level=log.VERBOSE_EXTREME) log.dbg(f'build dir: {build_dir}', level=log.VERBOSE_EXTREME)
if build_dir: if build_dir:
return os.path.abspath(build_dir) return os.path.abspath(build_dir)
else: else: