RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable the f-string ruff rule and fix warnings (#2965)

This commit is contained in:
correctmost 2024-11-30 04:03:09 -05:00 committed by GitHub
parent d4c04a83a3
commit 604526c3c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archinstall/lib/configuration.py
View File

@ -219,7 +219,7 @@ def save_config(config: dict[str, Any]) -> None:
if result.item() == MenuItem.no(): if result.item() == MenuItem.no():
return return
debug("Saving configuration files to {}".format(dest_path.absolute())) debug(f"Saving configuration files to {dest_path.absolute()}")
match save_option: match save_option:
case "user_config": case "user_config":

4
archinstall/lib/global_menu.py
View File

@ -413,9 +413,9 @@ class GlobalMenu(AbstractMenu):
output += str(_('Password')) + f': {secret(enc_config.encryption_password)}\n' output += str(_('Password')) + f': {secret(enc_config.encryption_password)}\n'
if enc_config.partitions: 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: 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: if enc_config.hsm_device:
output += f'HSM: {enc_config.hsm_device.manufacturer}' output += f'HSM: {enc_config.hsm_device.manufacturer}'

2
archinstall/lib/installer.py
View File

@ -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 # 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)) 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: # Guarantees that entity str does not contain invalid characters for a linux file name:
# \ / : * ? " < > | # \ / : * ? " < > |

1
pyproject.toml
View File

@ -221,7 +221,6 @@ ignore = [
"RUF039", # unraw-re-pattern "RUF039", # unraw-re-pattern
"UP028", # yield-in-for-loop "UP028", # yield-in-for-loop
"UP031", # printf-string-formatting "UP031", # printf-string-formatting
"UP032", # f-string
"UP037", # quoted-annotation "UP037", # quoted-annotation
"W191", # tab-indentation "W191", # tab-indentation
] ]