From 604526c3c8f0cacf0d75af34fb356928a82a6e2e Mon Sep 17 00:00:00 2001 From: correctmost <134317971+correctmost@users.noreply.github.com> Date: Sat, 30 Nov 2024 04:03:09 -0500 Subject: [PATCH] Enable the f-string ruff rule and fix warnings (#2965) --- archinstall/lib/configuration.py | 2 +- archinstall/lib/global_menu.py | 4 ++-- archinstall/lib/installer.py | 2 +- pyproject.toml | 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py index 55fd30a4..a9da537f 100644 --- a/archinstall/lib/configuration.py +++ b/archinstall/lib/configuration.py @@ -219,7 +219,7 @@ def save_config(config: dict[str, Any]) -> None: if result.item() == MenuItem.no(): return - debug("Saving configuration files to {}".format(dest_path.absolute())) + debug(f"Saving configuration files to {dest_path.absolute()}") match save_option: case "user_config": diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py index 4fe7758c..a7468349 100644 --- a/archinstall/lib/global_menu.py +++ b/archinstall/lib/global_menu.py @@ -413,9 +413,9 @@ class GlobalMenu(AbstractMenu): output += str(_('Password')) + f': {secret(enc_config.encryption_password)}\n' if enc_config.partitions: - output += 'Partitions: {} selected'.format(len(enc_config.partitions)) + '\n' + output += f'Partitions: {len(enc_config.partitions)} selected\n' elif enc_config.lvm_volumes: - output += 'LVM volumes: {} selected'.format(len(enc_config.lvm_volumes)) + '\n' + output += f'LVM volumes: {len(enc_config.lvm_volumes)} selected\n' if enc_config.hsm_device: output += f'HSM: {enc_config.hsm_device.manufacturer}' diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 61fd1fdf..e5e1a43a 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -1494,7 +1494,7 @@ Exec = /bin/sh -c "{hook_command}" # We count how many files are there already so we know which number to prefix the file with num_of_rules_already = len(os.listdir(sudoers_dir)) - file_num_str = "{:02d}".format(num_of_rules_already) # We want 00_user1, 01_user2, etc + file_num_str = f"{num_of_rules_already:02d}" # We want 00_user1, 01_user2, etc # Guarantees that entity str does not contain invalid characters for a linux file name: # \ / : * ? " < > | diff --git a/pyproject.toml b/pyproject.toml index 0cc0d218..8f39a3e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -221,7 +221,6 @@ ignore = [ "RUF039", # unraw-re-pattern "UP028", # yield-in-for-loop "UP031", # printf-string-formatting - "UP032", # f-string "UP037", # quoted-annotation "W191", # tab-indentation ]