From 8ba8fda54b96d57a63d400e324472fb53a25eca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Aug 2025 15:26:11 +0200 Subject: [PATCH] RUF100: fix --- pkgs/clan-app/clan_app/deps/http/http_bridge.py | 6 +++--- pkgs/clan-app/clan_app/deps/http/test_http_api.py | 6 +++--- pkgs/clan-cli/clan_cli/tests/test_machines_cli.py | 1 - pkgs/clan-cli/clan_lib/flake/flake_cache_test.py | 14 +++++++------- pkgs/clan-cli/clan_lib/flake/flake_test.py | 4 ++-- pkgs/clan-cli/clan_lib/machines/actions_test.py | 2 +- pkgs/clan-cli/clan_lib/nix_models/clan.py | 3 --- .../clan_lib/persist/inventory_store_test.py | 1 - pkgs/classgen/main.py | 3 --- pyproject.toml | 1 - 10 files changed, 16 insertions(+), 25 deletions(-) diff --git a/pkgs/clan-app/clan_app/deps/http/http_bridge.py b/pkgs/clan-app/clan_app/deps/http/http_bridge.py index 91ee2bd2a..a6a3ea8fa 100644 --- a/pkgs/clan-app/clan_app/deps/http/http_bridge.py +++ b/pkgs/clan-app/clan_app/deps/http/http_bridge.py @@ -191,13 +191,13 @@ class HttpBridge(ApiBridge, BaseHTTPRequestHandler): return file_data - def do_OPTIONS(self) -> None: # noqa: N802 + def do_OPTIONS(self) -> None: """Handle CORS preflight requests.""" self.send_response_only(200) self._send_cors_headers() self.end_headers() - def do_GET(self) -> None: # noqa: N802 + def do_GET(self) -> None: """Handle GET requests.""" parsed_url = urlparse(self.path) path = parsed_url.path @@ -211,7 +211,7 @@ class HttpBridge(ApiBridge, BaseHTTPRequestHandler): else: self.send_api_error_response("info", "Not Found", ["http_bridge", "GET"]) - def do_POST(self) -> None: # noqa: N802 + def do_POST(self) -> None: """Handle POST requests.""" parsed_url = urlparse(self.path) path = parsed_url.path diff --git a/pkgs/clan-app/clan_app/deps/http/test_http_api.py b/pkgs/clan-app/clan_app/deps/http/test_http_api.py index db64fd9f5..68e5841a7 100644 --- a/pkgs/clan-app/clan_app/deps/http/test_http_api.py +++ b/pkgs/clan-app/clan_app/deps/http/test_http_api.py @@ -136,14 +136,14 @@ class TestHttpApiServer: try: # Test root endpoint - response = urlopen("http://127.0.0.1:8081/") # noqa: S310 + response = urlopen("http://127.0.0.1:8081/") data: dict = json.loads(response.read().decode()) assert data["body"]["status"] == "success" assert data["body"]["data"]["message"] == "Clan API Server" assert data["body"]["data"]["version"] == "1.0.0" # Test methods endpoint - response = urlopen("http://127.0.0.1:8081/api/methods") # noqa: S310 + response = urlopen("http://127.0.0.1:8081/api/methods") data = json.loads(response.read().decode()) assert data["body"]["status"] == "success" assert "test_method" in data["body"]["data"]["methods"] @@ -179,7 +179,7 @@ class TestHttpApiServer: try: # Test 404 error - res = urlopen("http://127.0.0.1:8081/nonexistent") # noqa: S310 + res = urlopen("http://127.0.0.1:8081/nonexistent") assert res.status == 200 body = json.loads(res.read().decode())["body"] assert body["status"] == "error" diff --git a/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py b/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py index 10545e06f..eb1e156de 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py +++ b/pkgs/clan-cli/clan_cli/tests/test_machines_cli.py @@ -1,4 +1,3 @@ -# ruff: noqa: SLF001 import argparse import pytest diff --git a/pkgs/clan-cli/clan_lib/flake/flake_cache_test.py b/pkgs/clan-cli/clan_lib/flake/flake_cache_test.py index 9ef0a0eec..ddf1fd9e3 100644 --- a/pkgs/clan-cli/clan_lib/flake/flake_cache_test.py +++ b/pkgs/clan-cli/clan_lib/flake/flake_cache_test.py @@ -45,15 +45,15 @@ def test_cache_persistance(flake: ClanFlake) -> None: flake2 = Flake(str(flake.path)) flake1.invalidate_cache() flake2.invalidate_cache() - assert isinstance(flake1._cache, FlakeCache) # noqa: SLF001 - assert isinstance(flake2._cache, FlakeCache) # noqa: SLF001 - assert not flake1._cache.is_cached( # noqa: SLF001 + assert isinstance(flake1._cache, FlakeCache) + assert isinstance(flake2._cache, FlakeCache) + assert not flake1._cache.is_cached( "nixosConfigurations.*.config.networking.hostName", ) flake1.select("nixosConfigurations.*.config.networking.hostName") flake1.select("nixosConfigurations.*.config.networking.{hostName,hostId}") flake2.invalidate_cache() - assert flake2._cache.is_cached( # noqa: SLF001 + assert flake2._cache.is_cached( "nixosConfigurations.*.config.networking.{hostName,hostId}", ) @@ -312,10 +312,10 @@ def test_cache_gc(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None: my_flake.select("testfile") else: my_flake.select("testfile") - assert my_flake._cache is not None # noqa: SLF001 - assert my_flake._cache.is_cached("testfile") # noqa: SLF001 + assert my_flake._cache is not None + assert my_flake._cache.is_cached("testfile") subprocess.run(["nix-collect-garbage"], check=True) - assert not my_flake._cache.is_cached("testfile") # noqa: SLF001 + assert not my_flake._cache.is_cached("testfile") def test_store_path_with_line_numbers_not_wrapped() -> None: diff --git a/pkgs/clan-cli/clan_lib/flake/flake_test.py b/pkgs/clan-cli/clan_lib/flake/flake_test.py index 15ea1fdc6..35d66dde9 100644 --- a/pkgs/clan-cli/clan_lib/flake/flake_test.py +++ b/pkgs/clan-cli/clan_lib/flake/flake_test.py @@ -207,8 +207,8 @@ def test_conditional_all_selector(flake: ClanFlake) -> None: flake2 = Flake(str(flake.path)) flake1.invalidate_cache() flake2.invalidate_cache() - assert isinstance(flake1._cache, FlakeCache) # noqa: SLF001 - assert isinstance(flake2._cache, FlakeCache) # noqa: SLF001 + assert isinstance(flake1._cache, FlakeCache) + assert isinstance(flake2._cache, FlakeCache) log.info("First select") res1 = flake1.select("inputs.*.{?clan,?missing}.templates.*.*.description") diff --git a/pkgs/clan-cli/clan_lib/machines/actions_test.py b/pkgs/clan-cli/clan_lib/machines/actions_test.py index 31def6fcc..bea24e0ed 100644 --- a/pkgs/clan-cli/clan_lib/machines/actions_test.py +++ b/pkgs/clan-cli/clan_lib/machines/actions_test.py @@ -212,7 +212,7 @@ def test_get_machine_writeability(clan_flake: Callable[..., Flake]) -> None: inventory_store.write(inventory, message="Test writeability") # Check that the tags were updated - persisted = inventory_store._get_persisted() # noqa: SLF001 + persisted = inventory_store._get_persisted() assert get_value_by_path(persisted, "machines.jon.tags", []) == new_tags write_info = get_machine_fields_schema(Machine("jon", flake)) diff --git a/pkgs/clan-cli/clan_lib/nix_models/clan.py b/pkgs/clan-cli/clan_lib/nix_models/clan.py index fce261d54..ea055bf16 100644 --- a/pkgs/clan-cli/clan_lib/nix_models/clan.py +++ b/pkgs/clan-cli/clan_lib/nix_models/clan.py @@ -1,9 +1,6 @@ # DO NOT EDIT THIS FILE MANUALLY. IT IS GENERATED. # This file was generated by running `pkgs/clan-cli/clan_lib.inventory/update.sh` # -# ruff: noqa: N815 -# ruff: noqa: N806 -# ruff: noqa: F401 # fmt: off from typing import Any, Literal, NotRequired, TypedDict diff --git a/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py b/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py index d55d17ceb..467251ef5 100644 --- a/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py +++ b/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py @@ -1,4 +1,3 @@ -# ruff: noqa: SLF001 import json import os import shutil diff --git a/pkgs/classgen/main.py b/pkgs/classgen/main.py index b2a737f8e..66a82baf0 100644 --- a/pkgs/classgen/main.py +++ b/pkgs/classgen/main.py @@ -420,9 +420,6 @@ def run_gen(args: argparse.Namespace) -> None: """# DO NOT EDIT THIS FILE MANUALLY. IT IS GENERATED. # This file was generated by running `pkgs/clan-cli/clan_lib.inventory/update.sh` # -# ruff: noqa: N815 -# ruff: noqa: N806 -# ruff: noqa: F401 # fmt: off from typing import Any, Literal, NotRequired, TypedDict\n diff --git a/pyproject.toml b/pyproject.toml index 32c55822f..276551f5d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,7 +45,6 @@ lint.ignore = [ "PLR2004", "PT001", "PT023", - "RUF100", "S603", "S607", "T201",