Merge pull request #132 from nathanchance/update-ruff-toml

Author: msfjarvis

boot-qemu.py

@@ -1,22 +1,21 @@
 #!/usr/bin/env python3
 # pylint: disable=invalid-name
 
-from argparse import ArgumentParser
-from collections.abc import Sequence
 import contextlib
 import os
-from pathlib import Path
 import platform
 import re
 import shlex
 import shutil
 import subprocess
 import sys
+from argparse import ArgumentParser
+from collections.abc import Sequence
+from pathlib import Path
 from typing import Any, Union
 
 import utils
 
-
 SUPPORTED_ARCHES = [
     'arm',
     'arm32_v5',
@@ -108,9 +107,7 @@ def _get_default_smp_value(self) -> int:
         #   * <kernel_dir>/../../../.config (if the image is in arch/*/boot/)
         #   * <kernel_dir>/config (if the image is in a TuxMake folder)
         possible_locations = ['.config', '../../../.config', 'config']
-        configuration = utils.find_first_file(
-            self.kernel_dir, possible_locations, required=False
-        )
+        configuration = utils.find_first_file(self.kernel_dir, possible_locations, required=False)
 
         config_nr_cpus = 8  # sensible default based on treewide defaults,
         if configuration != utils.UNINIT_PATH:
@@ -129,21 +126,19 @@ def _get_kernel_ver_tuple(self, decomp_prog: str) -> tuple[int, ...]:
             raise RuntimeError('No kernel set?')
 
         utils.check_cmd(decomp_prog)
-        if decomp_prog in ('gzip',):
+        if decomp_prog == 'gzip':
             decomp_cmd = [decomp_prog, '-c', '-d', self.kernel]
         else:
             raise RuntimeError(f"Unsupported decompression program ('{decomp_prog}')?")
         decomp = subprocess.run(decomp_cmd, capture_output=True, check=True)
 
         utils.check_cmd('strings')
-        strings = subprocess.run(
-            'strings', capture_output=True, check=True, input=decomp.stdout
-        )
+        strings = subprocess.run('strings', capture_output=True, check=True, input=decomp.stdout)
         strings_stdout = strings.stdout.decode(encoding='utf-8', errors='ignore')
 
         if not (
             match := re.search(
-                r'^Linux version (\d+\.\d+\.\d+)', strings_stdout, flags=re.M
+                r'^Linux version (\d+\.\d+\.\d+)', strings_stdout, flags=re.MULTILINE
             )
         ):
             raise RuntimeError(f"Could not find Linux version in {self.kernel}?")
@@ -505,7 +500,9 @@ def __init__(self) -> None:
         bios = Path(utils.BOOT_UTILS, 'images', self._initrd_arch, 'QEMU_EFI.fd')
         if not bios.exists():
             bios.parent.mkdir(exist_ok=True, parents=True)
-            firmware_url = f"https://github.com/loongson/Firmware/raw/main/LoongArchVirtMachine/{bios.name}"
+            firmware_url = (
+                f"https://github.com/loongson/Firmware/raw/main/LoongArchVirtMachine/{bios.name}"
+            )
             utils.green(f"Downloading LoongArch firmware from {firmware_url}...")
             curl_cmd = ['curl', '-LSs', '-o', bios, firmware_url]
             subprocess.run(curl_cmd, check=True)
@@ -694,9 +691,7 @@ def run(self) -> None:
                 Path('OVMF/OVMF_VARS.fd'),  # Debian and Ubuntu
             ]
             ovmf_vars = utils.find_first_file(usr_share, ovmf_vars_locations)
-            self._efi_vars = Path(
-                utils.BOOT_UTILS, 'images', self._initrd_arch, ovmf_vars.name
-            )
+            self._efi_vars = Path(utils.BOOT_UTILS, 'images', self._initrd_arch, ovmf_vars.name)
             # This file is in /usr/share, so it must be copied in order to be
             # modified.
             shutil.copyfile(ovmf_vars, self._efi_vars)
@@ -720,12 +715,8 @@ def guess_arch(kernel_arg: Path) -> str:
     #
     # Note: 'required=False' just to provide our own exception.
     vmlinux_locations = ['vmlinux', '../../../vmlinux']
-    if not (
-        vmlinux := utils.find_first_file(kernel_dir, vmlinux_locations, required=False)
-    ):
-        raise RuntimeError(
-            'Architecture was not provided and vmlinux could not be found!'
-        )
+    if not (vmlinux := utils.find_first_file(kernel_dir, vmlinux_locations, required=False)):
+        raise RuntimeError('Architecture was not provided and vmlinux could not be found!')
 
     if not (file := shutil.which('file')):
         raise RuntimeError("Architecture was not provided and 'file' is not installed!")
@@ -783,9 +774,7 @@ def parse_arguments():
         help="The architecture to boot. If omitted, value will be guessed based on 'vmlinux' if available. Possible values are: %(choices)s",
         metavar='ARCH',
     )
-    parser.add_argument(
-        '--efi', action='store_true', help='Boot kernel via UEFI (x86_64 only)'
-    )
+    parser.add_argument('--efi', action='store_true', help='Boot kernel via UEFI (x86_64 only)')
     parser.add_argument(
         '-g',
         '--gdb',
@@ -855,9 +844,7 @@ def parse_arguments():
     args = parse_arguments()
 
     if not (kernel_location := Path(args.kernel_location).resolve()).exists():
-        raise FileNotFoundError(
-            f"Supplied kernel location ('{kernel_location}') does not exist!"
-        )
+        raise FileNotFoundError(f"Supplied kernel location ('{kernel_location}') does not exist!")
 
     if not (arch := args.architecture):
         arch = guess_arch(kernel_location)
@@ -900,9 +887,7 @@ def parse_arguments():
     if args.efi:
         runner.efi = runner.supports_efi
         if not runner.efi:
-            utils.yellow(
-                f"EFI boot requested on unsupported architecture ('{arch}'), ignoring..."
-            )
+            utils.yellow(f"EFI boot requested on unsupported architecture ('{arch}'), ignoring...")
 
     if args.gdb:
         runner.gdb = True
@@ -921,13 +906,9 @@ def parse_arguments():
 
     if args.modules:
         if not (modules := Path(args.modules).resolve()).exists():
-            raise FileNotFoundError(
-                f"Supplied modules .cpio ('{modules}') does not exist?"
-            )
+            raise FileNotFoundError(f"Supplied modules .cpio ('{modules}') does not exist?")
         if not args.memory:
-            utils.yellow(
-                'Memory not specified, the default may be too small for modules...'
-            )
+            utils.yellow('Memory not specified, the default may be too small for modules...')
         runner.modules = modules
 
     if args.no_kvm:

boot-uml.py

@@ -2,8 +2,8 @@
 # pylint: disable=invalid-name
 
 import argparse
-from pathlib import Path
 import subprocess
+from pathlib import Path
 
 import utils
 

buildroot/rebuild.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-from argparse import ArgumentParser
 import datetime
 import os
-from pathlib import Path
 import shutil
 import subprocess
+from argparse import ArgumentParser
+from pathlib import Path
 
 BUILDROOT_VERSION = '2024.02.8'
 SUPPORTED_ARCHES = [
@@ -175,9 +175,7 @@ def parse_arguments():
     if not shutil.which('zstd'):
         raise RuntimeError('zstd could not be found on your system, please install it!')
 
-    architectures = (
-        SUPPORTED_ARCHES if 'all' in args.architectures else args.architectures
-    )
+    architectures = SUPPORTED_ARCHES if 'all' in args.architectures else args.architectures
 
     download_and_extract_buildroot()
     for arch in architectures:

ruff.toml

@@ -1,4 +1,5 @@
 target-version = 'py39'
+line-length = 100
 
 [format]
 quote-style = 'preserve'
@@ -10,8 +11,13 @@ select = [
     'ARG', # flake8-unused-arguments
     'B', # flake8-bugbear
     'C4', # flake8-comprehensions
+    'DTZ', # flake8-datetimes
     'E', # pycodestyle
     'F', # pyflakes
+    'FURB', # refurb
+    'I', # isort
+    'N', # pep8-naming
+    'PERF', # perflint
     'PIE', # flake8-pie
     'PL', # pylint
     'PTH', # flake8-use-pathlib
@@ -20,6 +26,8 @@ select = [
     'S', # flake8-bandit
     'SIM', # flake8-simplify
     'SLF', # flake8-self
+    'TC', # flake8-type-checking
+    'TRY', # tryceratops
     'UP', # pyupgrade
     'W', # pycodestyle
 ]
@@ -32,4 +40,5 @@ ignore = [
     'PLR2004', # magic-value-comparison
     'S603', # subprocess-without-shell-equals-true
     'S607', # start-process-with-partial-path
+    'TRY003', # raise-vanilla-args
 ]

utils.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 
-from collections.abc import Iterable
 import json
 import os
-from pathlib import Path
-import subprocess
 import shutil
+import subprocess
 import sys
+from collections.abc import Iterable
+from pathlib import Path
 from typing import Any, NoReturn, Optional, Union
 
 BOOT_UTILS = Path(__file__).resolve().parent
@@ -128,9 +128,7 @@ def get_full_kernel_path(
     elif arch:
         kernel = kernel_location.joinpath("arch", arch, "boot", image)
     else:
-        die(
-            f"Kernel image ('{image}') is in the arch/ directory but 'arch' was not provided!"
-        )
+        die(f"Kernel image ('{image}') is in the arch/ directory but 'arch' was not provided!")
 
     if not kernel.exists():
         die(f"Kernel ('{kernel}') does not exist!")
@@ -160,13 +158,9 @@ def get_gh_json(endpoint: str) -> dict[str, Any]:
     curl_cmd.append(endpoint)
 
     try:
-        curl_out = subprocess.run(
-            curl_cmd, capture_output=True, check=True, text=True
-        ).stdout
+        curl_out = subprocess.run(curl_cmd, capture_output=True, check=True, text=True).stdout
     except subprocess.CalledProcessError as err:
-        raise RuntimeError(
-            f"Failed to query GitHub API at {endpoint}: {err.stderr}"
-        ) from err
+        raise RuntimeError(f"Failed to query GitHub API at {endpoint}: {err.stderr}") from err
 
     return json.loads(curl_out)
 
@@ -201,9 +195,7 @@ def prepare_initrd(
     # querying the GitHub API at all.
     if gh_json_file and gh_json_file != UNINIT_PATH:
         if not gh_json_file.exists():
-            raise FileNotFoundError(
-                f"Provided GitHub JSON file ('{gh_json_file}') does not exist!"
-            )
+            raise FileNotFoundError(f"Provided GitHub JSON file ('{gh_json_file}') does not exist!")
         gh_json_rel = json.loads(gh_json_file.read_text(encoding='utf-8'))
     else:
         # Make sure that the current user is not rate limited by GitHub,
@@ -214,9 +206,7 @@ def prepare_initrd(
         # and cached the result, we can query for the latest release to make sure
         # that we are up to date.
         if (remaining := gh_json_rl['resources']['core']['remaining']) > 0:
-            gh_json_rel = get_gh_json(
-                f"https://api.github.com/repos/{REPO}/releases/latest"
-            )
+            gh_json_rel = get_gh_json(f"https://api.github.com/repos/{REPO}/releases/latest")
         elif not src.exists():
             limit = gh_json_rl['resources']['core']['limit']
             raise RuntimeError(