From 79eaf24084f9040e5a15ad63216e9d5a55e3d928 Mon Sep 17 00:00:00 2001 From: Patrik Teivonen Date: Wed, 1 Mar 2023 14:00:32 +0200 Subject: Fix flake8, isort, pylint linter warnings when running git hooks Change-Id: Id4ca869c36b68336429b7c2c8abc4e6a8dcfcbb8 Reviewed-by: Antti Kokko --- packaging-tools/build_clang.py | 12 ++++++++++-- packaging-tools/libclang_training/run_batch_files.py | 9 ++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/packaging-tools/build_clang.py b/packaging-tools/build_clang.py index 8c30e048c..548fd83bc 100644 --- a/packaging-tools/build_clang.py +++ b/packaging-tools/build_clang.py @@ -257,8 +257,16 @@ def mingw_training( # Train mingw clangd executable with build QtCreator run_command( - [os.path.join(training_dir, 'runBatchFiles.bat'), msvc_version(), 'x64' if bitness == 64 else 'x86'], - base_path, extra_environment=None, only_error_case_output=False, expected_exit_codes=[0, 1]) + command=[ + os.path.join(training_dir, 'runBatchFiles.bat'), + msvc_version(), + 'x64' if bitness == 64 else 'x86' + ], + cwd=base_path, + extra_environment=None, + only_error_case_output=False, + expected_exit_codes=[0, 1] + ) def is_msvc_toolchain(toolchain: str) -> bool: diff --git a/packaging-tools/libclang_training/run_batch_files.py b/packaging-tools/libclang_training/run_batch_files.py index 1ea06e020..0eb24c37d 100644 --- a/packaging-tools/libclang_training/run_batch_files.py +++ b/packaging-tools/libclang_training/run_batch_files.py @@ -39,11 +39,11 @@ The PATH must contain: import os import sys from pathlib import Path -from shutil import copyfile from subprocess import STDOUT, Popen -from time import sleep, time +from time import sleep from typing import Dict, List, Optional + def verbose_start(args: List[str]) -> None: if Config.Verbose: print(f"info: starting {args}") @@ -108,6 +108,7 @@ def create_environment() -> Dict[str, str]: return env + def run_sync_and_log_output_windows(args: List[str], log_file_path: str) -> None: debug_view = DebugView(log_file_path) debug_view.start_async() @@ -149,6 +150,7 @@ def create_dir(dir_path: str) -> None: print(f"info: creating not existent {dir_path}") Path(dir_path).mkdir(parents=True) + def main() -> None: Config.initialize_from_environment() Config.dump() @@ -158,8 +160,9 @@ def main() -> None: run_qtcreator_with_log_file(log_file_path) - with open(log_file_path) as log: + with open(log_file_path, encoding="utf-8") as log: print(log.read()) + if __name__ == "__main__": main() -- cgit v1.2.3