From db5571d6232a6892fb86a93fad7410187839faf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Aug 2025 15:23:08 +0200 Subject: [PATCH] SIM108: fix --- .../facts/secret_modules/password_store.py | 8 +++--- pkgs/clan-cli/clan_cli/vars/set.py | 5 +--- pkgs/clan-cli/clan_cli/vms/qemu.py | 7 +----- pkgs/clan-cli/clan_lib/cmd/__init__.py | 5 +--- pkgs/clan-cli/clan_lib/flake/flake.py | 25 ++++--------------- pyproject.toml | 1 - 6 files changed, 11 insertions(+), 40 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py b/pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py index 1a946fae7..68a673236 100644 --- a/pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py +++ b/pkgs/clan-cli/clan_cli/facts/secret_modules/password_store.py @@ -124,10 +124,8 @@ class SecretStore(SecretStoreBase): os.umask(0o077) for service in self.machine.facts_data: for secret in self.machine.facts_data[service]["secret"]: - if isinstance(secret, dict): - secret_name = secret["name"] - else: - # TODO: drop old format soon - secret_name = secret + secret_name = ( + secret["name"] if isinstance(secret, dict) else secret + ) # TODO: drop old format soon (output_dir / secret_name).write_bytes(self.get(service, secret_name)) (output_dir / ".pass_info").write_bytes(self.generate_hash()) diff --git a/pkgs/clan-cli/clan_cli/vars/set.py b/pkgs/clan-cli/clan_cli/vars/set.py index 04a0d7f85..8a6983a66 100644 --- a/pkgs/clan-cli/clan_cli/vars/set.py +++ b/pkgs/clan-cli/clan_cli/vars/set.py @@ -24,10 +24,7 @@ def set_var(machine: str | Machine, var: str | Var, value: bytes, flake: Flake) _machine = Machine(name=machine, flake=flake) else: _machine = machine - if isinstance(var, str): - _var = get_machine_var(_machine, var) - else: - _var = var + _var = get_machine_var(_machine, var) if isinstance(var, str) else var paths = _var.set(value) if paths: commit_files( diff --git a/pkgs/clan-cli/clan_cli/vms/qemu.py b/pkgs/clan-cli/clan_cli/vms/qemu.py index d37002bd4..225edb709 100644 --- a/pkgs/clan-cli/clan_cli/vms/qemu.py +++ b/pkgs/clan-cli/clan_cli/vms/qemu.py @@ -93,12 +93,7 @@ def get_machine_options() -> str: system = platform.system().lower() # Determine accelerator based on OS - if system == "darwin": - # macOS uses Hypervisor.framework - accel = "hvf" - else: - # Linux and others use KVM - accel = "kvm" + accel = "hvf" if system == "darwin" else "kvm" if arch in ("x86_64", "amd64", "i386", "i686"): # For x86_64, use q35 for modern PCIe support diff --git a/pkgs/clan-cli/clan_lib/cmd/__init__.py b/pkgs/clan-cli/clan_lib/cmd/__init__.py index 274430e3a..b730a34b4 100644 --- a/pkgs/clan-cli/clan_lib/cmd/__init__.py +++ b/pkgs/clan-cli/clan_lib/cmd/__init__.py @@ -386,10 +386,7 @@ def run( else: stack.enter_context(terminate_process_group(process)) - if isinstance(options.input, bytes): - input_bytes = options.input - else: - input_bytes = None + input_bytes = options.input if isinstance(options.input, bytes) else None stdout_buf, stderr_buf = handle_io( process, diff --git a/pkgs/clan-cli/clan_lib/flake/flake.py b/pkgs/clan-cli/clan_lib/flake/flake.py index aac2bdec4..13285ebce 100644 --- a/pkgs/clan-cli/clan_lib/flake/flake.py +++ b/pkgs/clan-cli/clan_lib/flake/flake.py @@ -238,10 +238,7 @@ def parse_selector(selector: str) -> list[Selector]: for i in range(len(selector)): c = selector[i] - if stack == []: - mode = "start" - else: - mode = stack[-1] + mode = "start" if stack == [] else stack[-1] if mode == "end": if c == ".": @@ -385,10 +382,7 @@ class FlakeCacheEntry: ) -> None: selector: Selector # if we have no more selectors, it means we select all keys from now one and futher down - if selectors == []: - selector = Selector(type=SelectorType.ALL) - else: - selector = selectors[0] + selector = Selector(type=SelectorType.ALL) if selectors == [] else selectors[0] # first we find out if we have all subkeys already @@ -528,10 +522,7 @@ class FlakeCacheEntry: if isinstance(self.value, str | float | int | None): return True - if selectors == []: - selector = Selector(type=SelectorType.ALL) - else: - selector = selectors[0] + selector = Selector(type=SelectorType.ALL) if selectors == [] else selectors[0] # we just fetch all subkeys, so we need to check of we inserted all keys at this level before if selector.type == SelectorType.ALL: @@ -582,10 +573,7 @@ class FlakeCacheEntry: def select(self, selectors: list[Selector]) -> Any: selector: Selector - if selectors == []: - selector = Selector(type=SelectorType.ALL) - else: - selector = selectors[0] + selector = Selector(type=SelectorType.ALL) if selectors == [] else selectors[0] # mirror nix behavior where we return outPath if no further selector is specified if selectors == [] and isinstance(self.value, dict) and "outPath" in self.value: @@ -758,10 +746,7 @@ class FlakeCache: self.cache: FlakeCacheEntry = FlakeCacheEntry() def insert(self, data: dict[str, Any], selector_str: str) -> None: - if selector_str: - selectors = parse_selector(selector_str) - else: - selectors = [] + selectors = parse_selector(selector_str) if selector_str else [] self.cache.insert(data, selectors) diff --git a/pyproject.toml b/pyproject.toml index 143e52f30..6924a263d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -49,7 +49,6 @@ lint.ignore = [ "RUF100", "S603", "S607", - "SIM108", "SIM112", "T201", "TD",