Merge pull request #707 from nathanchance/update-for-ruff-0.2.0

Update for ruff 0.2.0

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"
 

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),

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']