From 54f587f0f982095db47da6c712dd8b5cf9dcf94b Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Fri, 2 Feb 2024 16:05:16 -0700 Subject: [PATCH 1/2] ruff.toml: Update for 0.2.0 There is a deprecation warning for top level lint settings: warning: The top-level linter settings are deprecated in favour of their counterparts in the `lint` section. Please update the following options in `ruff.toml`: - 'ignore' -> 'lint.ignore' - 'select' -> 'lint.select' Move these under the lint section. Additionally, update the link to the rules. Signed-off-by: Nathan Chancellor --- ruff.toml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ruff.toml b/ruff.toml index 75980d1f..31f51e65 100644 --- a/ruff.toml +++ b/ruff.toml @@ -1,4 +1,9 @@ -# https://beta.ruff.rs/docs/rules/ +target-version = 'py38' +# Separate repo used as a submodule, ignore it +extend-exclude = ['boot-utils'] + +# https://docs.astral.sh/ruff/rules/ +[lint] select = [ 'A', # flake8-builtins 'ARG', # flake8-unused-arguments @@ -23,6 +28,3 @@ ignore = [ 'PLR0915', # too-many-statements 'PLR2004', # magic-value-comparison ] -target-version = 'py38' -# Separate repo used as a submodule, ignore it -extend-exclude = ['boot-utils'] From 165545a561db752fb98ce90ff0230b3656accc9b Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Fri, 2 Feb 2024 16:10:37 -0700 Subject: [PATCH 2/2] generator: Use dict.get() instead if else block Cleans up ruff warnings: generator/generate_tuxsuite.py:74:24: SIM401 Use `build.get("ARCH", "x86_64")` instead of an `if` block generator/generate_workflow.py:64:22: SIM401 Use `build.get("ARCH", "x86_64")` instead of an `if` block generator/generate_workflow.py:216:25: SIM401 Use `build.get("ARCH", "x86_64")` instead of an `if` block Signed-off-by: Nathan Chancellor --- generator/generate_tuxsuite.py | 2 +- generator/generate_workflow.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/generate_tuxsuite.py b/generator/generate_tuxsuite.py index fe52ee74..68a4bf53 100755 --- a/generator/generate_tuxsuite.py +++ b/generator/generate_tuxsuite.py @@ -71,7 +71,7 @@ def emit_tuxsuite_yml(config, tree, llvm_version): if build["git_repo"] == repo and \ build["git_ref"] == ref and \ build["llvm_version"] == llvm_version: - arch = build["ARCH"] if "ARCH" in build else "x86_64" + arch = build.get("ARCH", "x86_64") if llvm_version == max_version: toolchain = "clang-nightly" diff --git a/generator/generate_workflow.py b/generator/generate_workflow.py index 41c9692e..c4aebcb5 100755 --- a/generator/generate_workflow.py +++ b/generator/generate_workflow.py @@ -61,7 +61,7 @@ def print_config(build): def get_job_name(build): - job = "ARCH=" + (build["ARCH"] if "ARCH" in build else "x86_64") + job = "ARCH=" + build.get("ARCH", "x86_64") # BOOT=1 is the default, only show if we have disabled it if not build["boot"]: job += " BOOT=0" @@ -213,7 +213,7 @@ def get_steps(build, build_set): "name": name, "if": "${{ needs.check_cache.outputs.status != 'pass' }}", "env": { - "ARCH": build["ARCH"] if "ARCH" in build else "x86_64", + "ARCH": build.get("ARCH", "x86_64"), "LLVM_VERSION": build["llvm_version"], "BOOT": int(build["boot"]), "CONFIG": print_config(build),