Merge pull request #92 from nathanchance/update-ruff

Follow up fixes for ruff

Author: nathanchance

boot-qemu.py

@@ -75,28 +75,28 @@ def parse_arguments():
         "--shell",
         action="store_true",
         help=
-        "Instead of immediately shutting down the machine upon successful boot, pass 'rdinit=/bin/sh' on the kernel command line to allow interacting with the machine via a shell.",
+        "Instead of immediately shutting down the machine upon successful boot, pass 'rdinit=/bin/sh' on the kernel command line to allow interacting with the machine via a shell."
     )
     parser.add_argument(
         "-k",
         "--kernel-location",
         required=True,
         type=str,
         help=
-        "Path to kernel image or kernel build folder to search for image in. Can be an absolute or relative path.",
+        "Path to kernel image or kernel build folder to search for image in. Can be an absolute or relative path."
     )
     parser.add_argument(
         "--no-kvm",
         action="store_true",
         help=
-        "Do not use KVM for acceleration even when supported (only recommended for debugging).",
+        "Do not use KVM for acceleration even when supported (only recommended for debugging)."
     )
     parser.add_argument(
         "-s",
         "--smp",
         type=int,
         help=
-        "Number of processors for virtual machine. By default, only machines spawned with KVM will use multiple vCPUS.",
+        "Number of processors for virtual machine. By default, only machines spawned with KVM will use multiple vCPUS."
     )
     parser.add_argument(
         "-t",
@@ -656,7 +656,7 @@ def get_qemu_args(cfg):
         dtb = kernel.parent.joinpath(dtb_dir, dtb)
         if not dtb.exists():
             utils.die(
-                f"'{dtb.stem}' is required for booting but it could not be found at '{dtb}'",
+                f"'{dtb.stem}' is required for booting but it could not be found at '{dtb}'"
             )
 
         qemu_args += ["-dtb", dtb]
@@ -678,11 +678,10 @@ def get_qemu_args(cfg):
         qemu_args += ["-cpu", kvm_cpu]
         qemu_args += ["-enable-kvm"]
         qemu_args += ["-smp", str(smp_value)]
-    else:
-        # By default, we do not use '-smp' with TCG for performance reasons.
-        # Only add it if the user explicitly requested it.
-        if smp_requested:
-            qemu_args += ["-smp", str(smp_value)]
+    # By default, we do not use '-smp' with TCG for performance reasons.
+    # Only add it if the user explicitly requested it.
+    elif smp_requested:
+        qemu_args += ["-smp", str(smp_value)]
 
     # Other miscellaneous options
     qemu_args += ["-display", "none"]

boot-uml.py

@@ -24,15 +24,15 @@ def parse_arguments():
         "--interactive",
         action="store_true",
         help=
-        "Instead of immediately shutting down upon successful boot, pass 'init=/bin/sh' to the UML executable to allow interacting with UML via a shell.",
+        "Instead of immediately shutting down upon successful boot, pass 'init=/bin/sh' to the UML executable to allow interacting with UML via a shell."
     )
     parser.add_argument(
         "-k",
         "--kernel-location",
         required=True,
         type=str,
         help=
-        "Path to UML executable ('linux') or kernel build folder to search for executable in. Can be an absolute or relative path.",
+        "Path to UML executable ('linux') or kernel build folder to search for executable in. Can be an absolute or relative path."
     )
 
     return parser.parse_args()

ruff.toml

@@ -1,9 +1,9 @@
+# https://beta.ruff.rs/docs/rules/
 select = [
     'A', # flake8-builtins
     'ARG', # flake8-unused-arguments
     'B', # flake8-bugbear
     'C4', # flake8-comprehensions
-    'COM', # flake8-commas
     'E', # pycodestyle
     'F', # pyflakes
     'PIE', # flake8-pie

utils.py

@@ -14,9 +14,8 @@ def check_cmd(cmd):
         cmd (str): External command name or path.
     """
     if not shutil.which(cmd):
-        die(
-            f"The external command '{cmd}' is needed but it could not be found in PATH, please install it!",
-        )
+        die(f"The external command '{cmd}' is needed but it could not be found in PATH, please install it!"
+            )
 
 
 def die(string):
@@ -49,19 +48,16 @@ def get_full_kernel_path(kernel_location, image, arch=None):
     # If '-k' is a file, we can just use it directly
     if kernel_location.is_file():
         kernel = kernel_location
-    # If not, we need to find it based on the kernel build directory
+    # If the image is an uncompressed vmlinux or a UML image, it is in the
+    # root of the build folder
+    elif image in ("vmlinux", "linux"):
+        kernel = kernel_location.joinpath(image)
+    # Otherwise, it is in the architecture's boot directory
     else:
-        # If the image is an uncompressed vmlinux or a UML image, it is in the
-        # root of the build folder
-        if image in ("vmlinux", "linux"):
-            kernel = kernel_location.joinpath(image)
-        # Otherwise, it is in the architecture's boot directory
-        else:
-            if not arch:
-                die(
-                    f"Kernel image ('{image}') is in the arch/ directory but 'arch' was not provided!",
+        if not arch:
+            die(f"Kernel image ('{image}') is in the arch/ directory but 'arch' was not provided!"
                 )
-            kernel = kernel_location.joinpath("arch", arch, "boot", image)
+        kernel = kernel_location.joinpath("arch", arch, "boot", image)
 
     if not kernel.exists():
         die(f"Kernel ('{kernel}') does not exist!")