InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 10:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

siso: finish making all function type strict with type hints.

Browse Source 
Change-Id: I704549b7d8d27675de0100e7ab6bf9476a6a6964
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7260155
Commit-Queue: Alex Ovsienko <ovsienko@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
This commit is contained in:
Alex Ovsienko
2025-12-15 02:20:54 -08:00
committed by LUCI CQ
parent 5e033c9735
commit c34ff73940
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
siso.py
View File

@@ -31,7 +31,7 @@ _OTLP_DEFAULT_TCP_ENDPOINT = "127.0.0.1:4317"
_OTLP_HEALTH_PORT = 13133 _OTLP_HEALTH_PORT = 13133
def parse_args(args): def parse_args(args: list[str]) -> tuple[str, str]:
subcmd = '' subcmd = ''
out_dir = "." out_dir = "."
for i, arg in enumerate(args): for i, arg in enumerate(args):
@@ -225,7 +225,7 @@ def _start_collector(siso_path: str, sockets_file: Optional[str],
return False return False
def check_outdir(subcmd, out_dir): def check_outdir(out_dir: str) -> None:
ninja_marker = os.path.join(out_dir, ".ninja_deps") ninja_marker = os.path.join(out_dir, ".ninja_deps")
if os.path.exists(ninja_marker): if os.path.exists(ninja_marker):
print("depot_tools/siso.py: %s contains Ninja state file.\n" print("depot_tools/siso.py: %s contains Ninja state file.\n"
@@ -369,7 +369,7 @@ def _handle_collector_args(siso_path: str, args: list[str],
return args return args
def load_sisorc(rcfile): def load_sisorc(rcfile: str) -> tuple[list[str], dict[str, list[str]]]:
if not os.path.exists(rcfile): if not os.path.exists(rcfile):
return [], {} return [], {}
global_flags = [] global_flags = []
@@ -437,12 +437,13 @@ def _process_args(global_flags: list[str], subcmd_flags: dict[str, list[str]],
return new_args return new_args
def _is_google_corp_machine(): def _is_google_corp_machine() -> bool:
"""This assumes that corp machine has gcert binary in known location.""" """This assumes that corp machine has gcert binary in known location."""
return shutil.which("gcert") is not None return shutil.which("gcert") is not None
def main(args, telemetry_cfg: Optional[build_telemetry.Config] = None): def main(args: list[str],
telemetry_cfg: Optional[build_telemetry.Config] = None):
# Do not raise KeyboardInterrupt on SIGINT so as to give siso time to run # Do not raise KeyboardInterrupt on SIGINT so as to give siso time to run
# cleanup tasks. Siso will be terminated immediately after the second # cleanup tasks. Siso will be terminated immediately after the second
# Ctrl-C. # Ctrl-C.
@@ -560,7 +561,7 @@ def main(args, telemetry_cfg: Optional[build_telemetry.Config] = None):
if siso_path and os.path.isfile(siso_path): if siso_path and os.path.isfile(siso_path):
processed_args = _handle_collector_args(siso_path, processed_args = _handle_collector_args(siso_path,
processed_args, env) processed_args, env)
check_outdir(subcmd, out_dir) check_outdir(out_dir)
return caffeinate.call([siso_path] + processed_args, env=env) return caffeinate.call([siso_path] + processed_args, env=env)
print( print(
'depot_tools/siso.py: Could not find siso in third_party/siso ' 'depot_tools/siso.py: Could not find siso in third_party/siso '