fix(ty): correct invalid return types

amilcarlucas · amilcarlucas · commit 0f84f27a265e · 2026-04-24T01:30:53.000+02:00
fixes #1503
diff --git a/ardupilot_methodic_configurator/data_model_template_overview.py b/ardupilot_methodic_configurator/data_model_template_overview.py
@@ -50,4 +50,4 @@ def columns() -> tuple[str, ...]:
         )
 
     def attributes(self) -> list[str]:
-        return self.__dict__.keys()  # type: ignore[return-value]
+        return list(self.__dict__)
diff --git a/ardupilot_methodic_configurator/tempcal_imu.py b/ardupilot_methodic_configurator/tempcal_imu.py
@@ -211,7 +211,7 @@ def IMUs(self) -> list[int]:  # noqa: N802
         if len(self.accel.keys()) != len(self.gyro.keys()):
             logging.critical("accel and gyro data doesn't match")
             sys.exit(1)
-        return self.accel.keys()  # type: ignore[return-value]
+        return list(self.accel)
 
     def add_accel(self, imu: int, temperature: float, time: float, value: Vector3) -> None:
         if imu not in self.accel:
@@ -260,26 +260,26 @@ def filter(self, width_s: int) -> None:
     def accel_at_temp(self, imu: int, axis: str, temperature: float) -> float:
         """Return the accel value closest to the given temperature."""
         if temperature < self.accel[imu]["T"][0]:
-            return self.accel[imu][axis][0]  # type: ignore[no-any-return]
+            return float(self.accel[imu][axis][0])
         for i in range(len(self.accel[imu]["T"]) - 1):
             if self.accel[imu]["T"][i] <= temperature <= self.accel[imu]["T"][i + 1]:
                 v1 = self.accel[imu][axis][i]
                 v2 = self.accel[imu][axis][i + 1]
                 p = (temperature - self.accel[imu]["T"][i]) / (self.accel[imu]["T"][i + 1] - self.accel[imu]["T"][i])
-                return v1 + (v2 - v1) * p  # type: ignore[no-any-return]
-        return self.accel[imu][axis][-1]  # type: ignore[no-any-return]
+                return float(v1 + (v2 - v1) * p)
+        return float(self.accel[imu][axis][-1])
 
     def gyro_at_temp(self, imu: int, axis: str, temperature: float) -> float:
         """Return the gyro value closest to the given temperature."""
         if temperature < self.gyro[imu]["T"][0]:
-            return self.gyro[imu][axis][0]  # type: ignore[no-any-return]
+            return float(self.gyro[imu][axis][0])
         for i in range(len(self.gyro[imu]["T"]) - 1):
             if self.gyro[imu]["T"][i] <= temperature <= self.gyro[imu]["T"][i + 1]:
                 v1 = self.gyro[imu][axis][i]
                 v2 = self.gyro[imu][axis][i + 1]
                 p = (temperature - self.gyro[imu]["T"][i]) / (self.gyro[imu]["T"][i + 1] - self.gyro[imu]["T"][i])
-                return v1 + (v2 - v1) * p  # type: ignore[no-any-return]
-        return self.gyro[imu][axis][-1]  # type: ignore[no-any-return]
+                return float(v1 + (v2 - v1) * p)
+        return float(self.gyro[imu][axis][-1])
 
 
 def constrain(value: float, minv: float, maxv: float) -> Union[float, int]:
diff --git a/tests/acceptance_use_fc_params_from_file.py b/tests/acceptance_use_fc_params_from_file.py
@@ -15,6 +15,7 @@
 
 import os
 from argparse import ArgumentParser
+from collections.abc import Generator
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from unittest.mock import MagicMock, patch
@@ -32,7 +33,7 @@
 
 
 @pytest.fixture
-def temp_vehicle_dir() -> str:
+def temp_vehicle_dir() -> Generator[str, None, None]:
     """Fixture providing a temporary directory for vehicle configuration."""
     with TemporaryDirectory(prefix="test_vehicle_") as tmpdir:
         yield tmpdir
diff --git a/tests/bdd_frontend_tkinter_show.py b/tests/bdd_frontend_tkinter_show.py
@@ -659,7 +659,7 @@ class TestTooltipFunctionality:  # pylint: disable=too-many-public-methods
     """Test the Tooltip class and related functions."""
 
     @pytest.fixture(autouse=True)
-    def reset_active_tooltip(self) -> None:
+    def reset_active_tooltip(self) -> Generator[None, None, None]:
         """Ensure tooltip singleton state does not leak across tests."""
         Tooltip._active_tooltip = None
         yield
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -30,6 +30,7 @@
 from test_data_model_vehicle_components_common import SAMPLE_DOC_DICT, ComponentDataModelFixtures
 
 from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem
+from ardupilot_methodic_configurator.backend_filesystem_vehicle_components import VehicleComponents
 from ardupilot_methodic_configurator.backend_flightcontroller import FlightController
 from ardupilot_methodic_configurator.data_model_parameter_editor import ParameterEditor
 from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
@@ -156,7 +157,7 @@ def _mock_context(config: Optional[MockConfiguration] = None) -> tuple[contextli
 
 # Make all fixtures available across test files
 @pytest.fixture
-def vehicle_components() -> ComponentDataModelFixtures:
+def vehicle_components() -> VehicleComponents:
     """Create a VehicleComponents instance."""
     return ComponentDataModelFixtures.create_vehicle_components()
 
diff --git a/tests/test_backend_flightcontroller_connection.py b/tests/test_backend_flightcontroller_connection.py
@@ -23,9 +23,6 @@
 import serial.tools.list_ports_common
 from pymavlink import mavutil
 
-if TYPE_CHECKING:
-    from ardupilot_methodic_configurator.backend_flightcontroller_protocols import MavlinkConnection
-
 from ardupilot_methodic_configurator.backend_flightcontroller_connection import (
     DEFAULT_BAUDRATE,
     SUPPORTED_BAUDRATES,
@@ -43,6 +40,9 @@
 )
 from ardupilot_methodic_configurator.data_model_flightcontroller_info import FlightControllerInfo
 
+if TYPE_CHECKING:
+    from ardupilot_methodic_configurator.backend_flightcontroller_protocols import MavlinkConnection
+
 # pylint: disable=protected-access, too-many-lines
 
 
diff --git a/tests/test_data_model_flightcontroller_info.py b/tests/test_data_model_flightcontroller_info.py
@@ -75,7 +75,7 @@ def fc_info_with_complete_data(self, fc_info_with_basic_data) -> FlightControlle
         return fc_info
 
     @pytest.fixture
-    def mocked_mavutil_enums(self) -> MagicMock:
+    def mocked_mavutil_enums(self) -> dict[str, dict[int, MagicMock]]:
         """Fixture providing mocked mavutil enums."""
         return {
             "MAV_PROTOCOL_CAPABILITY": {
diff --git a/tests/test_extract_missing_translations.py b/tests/test_extract_missing_translations.py
@@ -14,6 +14,7 @@
 import sys
 import tempfile
 import unittest
+from collections.abc import Generator
 from unittest.mock import MagicMock, call, patch
 
 import pytest
@@ -316,7 +317,7 @@ def test_main(self, mock_logging, mock_output, mock_extract, mock_args) -> None:
 
 # These are pytest-style standalone functions, outside the class
 @pytest.fixture
-def temp_dir() -> str:
+def temp_dir() -> Generator[str, None, None]:
     with tempfile.TemporaryDirectory() as tmpdirname:
         yield tmpdirname
 
diff --git a/tests/test_extract_param_defaults.py b/tests/test_extract_param_defaults.py
@@ -11,6 +11,7 @@
 """
 
 import unittest
+from collections.abc import Generator
 from unittest.mock import MagicMock, Mock, call, patch
 
 import pytest
@@ -30,7 +31,7 @@
 
 
 @pytest.fixture
-def mock_print() -> Mock:
+def mock_print() -> Generator[Mock, None, None]:
     with patch("builtins.print") as mock:
         yield mock
 
diff --git a/tests/test_frontend_tkinter_component_editor.py b/tests/test_frontend_tkinter_component_editor.py
@@ -11,6 +11,7 @@
 """
 
 import tkinter as tk
+from collections.abc import Generator
 from tkinter import ttk
 from unittest.mock import MagicMock, patch
 
@@ -34,7 +35,7 @@
 
 
 @pytest.fixture
-def editor_with_mocked_root() -> ComponentEditorWindow:
+def editor_with_mocked_root() -> Generator[ComponentEditorWindow, None, None]:
     """Create a mock ComponentEditorWindow for testing."""
     # Create the class without initialization
     with patch.object(ComponentEditorWindow, "__init__", return_value=None):
diff --git a/tests/test_frontend_tkinter_component_editor_base.py b/tests/test_frontend_tkinter_component_editor_base.py
@@ -12,6 +12,7 @@
 
 import tkinter as tk
 from argparse import ArgumentParser
+from collections.abc import Generator
 from tkinter import ttk
 from typing import Union, cast, get_args, get_origin
 from unittest.mock import MagicMock, patch
@@ -126,7 +127,7 @@ def test_argument_parser_with_skip_component_editor(self) -> None:
 
 
 @pytest.fixture
-def editor_with_mocked_root() -> ComponentEditorWindowBase:
+def editor_with_mocked_root() -> Generator[ComponentEditorWindowBase, None, None]:
     """Create a mock ComponentEditorWindowBase for testing."""
     # Create the class without initialization
     with patch.object(ComponentEditorWindowBase, "__init__", return_value=None):
diff --git a/tests/test_frontend_tkinter_entry_dynamic.py b/tests/test_frontend_tkinter_entry_dynamic.py
@@ -11,6 +11,7 @@
 """
 
 import tkinter as tk
+from collections.abc import Generator
 from tkinter.constants import END
 from unittest.mock import MagicMock, patch
 
@@ -24,7 +25,7 @@ class TestEntryWithDynamicalyFilteredListbox:  # pylint: disable=too-many-public
 
     # pylint: disable=protected-access
     @pytest.fixture
-    def setup_widget(self) -> tuple:
+    def setup_widget(self) -> Generator[tuple[tk.Tk, EntryWithDynamicalyFilteredListbox], None, None]:
         root = tk.Tk()
         list_of_items = ["item1", "item2", "item3", "anotheritem", "test"]
         widget = EntryWithDynamicalyFilteredListbox(root, list_of_items=list_of_items)
diff --git a/tests/test_frontend_tkinter_flightcontroller_connection_progress.py b/tests/test_frontend_tkinter_flightcontroller_connection_progress.py
@@ -10,6 +10,7 @@
 SPDX-License-Identifier: GPL-3.0-or-later
 """
 
+from collections.abc import Generator
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -23,7 +24,7 @@
 
 
 @pytest.fixture
-def mock_progress_window() -> tuple[MagicMock, MagicMock]:
+def mock_progress_window() -> Generator[tuple[MagicMock, MagicMock], None, None]:
     """Fixture providing a mock ProgressWindow for testing."""
     with patch(
         "ardupilot_methodic_configurator.frontend_tkinter_flightcontroller_connection_progress.ProgressWindow"
@@ -35,7 +36,7 @@ def mock_progress_window() -> tuple[MagicMock, MagicMock]:
 
 
 @pytest.fixture
-def mock_tkinter_root() -> tuple[MagicMock, MagicMock, MagicMock]:
+def mock_tkinter_root() -> Generator[tuple[MagicMock, MagicMock, MagicMock], None, None]:
     """Fixture providing a mock Tk root window."""
     with (
         patch("tkinter.Tk") as mock_tk,
diff --git a/tests/test_frontend_tkinter_parameter_editor_documentation_frame.py b/tests/test_frontend_tkinter_parameter_editor_documentation_frame.py
@@ -16,6 +16,7 @@
 import tkinter as tk
 from collections.abc import Generator
 from tkinter import ttk
+from typing import Optional
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -34,7 +35,7 @@ def mock_parameter_editor() -> MagicMock:
     manager.current_file = "01_initial_setup.param"
 
     # Mock documentation data retrieval
-    def mock_get_documentation_text_and_url(key: str) -> tuple[str, str]:
+    def mock_get_documentation_text_and_url(key: str) -> tuple[str, Optional[str]]:
         return {
             "blog": ("ArduPilot Forum Blog Post", "https://discuss.ardupilot.org/t/methodic-configurator/"),
             "wiki": ("Configuration Wiki Page", "https://ardupilot.org/copter/docs/configuring-hardware.html"),
diff --git a/tests/test_frontend_tkinter_parameter_editor_table.py b/tests/test_frontend_tkinter_parameter_editor_table.py
@@ -11,6 +11,7 @@
 """
 
 import tkinter as tk
+from collections.abc import Generator
 from tkinter import ttk
 from types import SimpleNamespace
 from typing import Any, Optional, cast
@@ -91,7 +92,7 @@ def create_mock_data_model_ardupilot_parameter(  # pylint: disable=too-many-argu
 
 
 @pytest.fixture
-def mock_master() -> tk.Tk:
+def mock_master() -> Generator[tk.Tk, None, None]:
     """Create a mock tkinter root window."""
     root = tk.Tk()
     yield root
diff --git a/tests/test_frontend_tkinter_usage_popup_window.py b/tests/test_frontend_tkinter_usage_popup_window.py
@@ -11,6 +11,7 @@
 """
 
 import tkinter as tk
+from collections.abc import Generator
 from tkinter import ttk
 from unittest.mock import MagicMock, Mock, patch
 
@@ -30,7 +31,7 @@
 
 
 @pytest.fixture
-def popup_window(tk_root) -> BaseWindow:
+def popup_window(tk_root) -> Generator[BaseWindow, None, None]:
     """Fixture providing a BaseWindow instance configured for popup display."""
     window = BaseWindow(tk_root)
     yield window
@@ -47,7 +48,7 @@ def rich_text_widget(popup_window) -> RichText:
 
 
 @pytest.fixture
-def mock_program_settings() -> MagicMock:
+def mock_program_settings() -> Generator[MagicMock, None, None]:
     """Fixture providing mocked ProgramSettings for popup preference testing."""
     with patch("ardupilot_methodic_configurator.frontend_tkinter_usage_popup_window.ProgramSettings") as mock_settings:
         mock_settings.display_usage_popup.return_value = True
diff --git a/tests/test_tempcal_imu.py b/tests/test_tempcal_imu.py
@@ -13,6 +13,7 @@
 import os
 import tempfile
 import unittest
+from collections.abc import Generator
 from unittest.mock import patch
 
 import numpy as np
@@ -248,7 +249,7 @@ def test_constrain(self) -> None:
 
 
 @pytest.fixture
-def temp_output_file() -> str:
+def temp_output_file() -> Generator[str, None, None]:
     """Fixture to create a temporary output file."""
     with tempfile.NamedTemporaryFile(delete=False) as tmp:
         yield tmp.name
diff --git a/tests/unit_backend_internet.py b/tests/unit_backend_internet.py
@@ -77,7 +77,7 @@ def test_download_file_success(mock_get, tmp_path) -> None:
 
 
 @pytest.fixture
-def mock_get_() -> Mock:
+def mock_get_() -> Generator[Mock, None, None]:
     with patch("ardupilot_methodic_configurator.backend_internet.requests_get") as _mock:
         yield _mock
 
@@ -564,12 +564,12 @@ def mock_response(self) -> Mock:
         return response
 
     @pytest.fixture
-    def mock_get(self) -> Mock:
+    def mock_get(self) -> Generator[Mock, None, None]:
         with patch("ardupilot_methodic_configurator.backend_internet.requests_get") as _mock:
             yield _mock
 
     @pytest.fixture
-    def mock_verify(self) -> Mock:
+    def mock_verify(self) -> Generator[Mock, None, None]:
         with patch("ardupilot_methodic_configurator.backend_internet._get_verify_param") as _mock:
             _mock.return_value = "/path/to/certs.pem"
             yield _mock
diff --git a/tests/unit_frontend_tkinter_software_update.py b/tests/unit_frontend_tkinter_software_update.py
@@ -386,8 +386,8 @@ def test_version_info_display(self) -> None:
             mock_calls = mock_label.call_args_list
             # Find the call that created the label with our version info
             version_label_call_found = False
-            for call in mock_calls:
-                _args, kwargs = call
+            for m_call in mock_calls:
+                _args, kwargs = m_call
                 if "text" in kwargs and kwargs["text"] == version_info:
                     version_label_call_found = True
                     break
diff --git a/ty.toml b/ty.toml
@@ -2,8 +2,5 @@
 invalid-argument-type = "ignore"
 unresolved-attribute = "ignore"
 invalid-assignment = "ignore"
-unused-type-ignore-comment = "ignore"
-possibly-missing-attribute = "ignore"
 # These are mostly ty false positives for now. Revisit this at a later date once ty fixes this upstream.
 too-many-positional-arguments = "ignore"
-invalid-return-type = "ignore"

Original file line number	Diff line number	Diff line change
`@@ -50,4 +50,4 @@ def columns() -> tuple[str, ...]:`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`def attributes(self) -> list[str]:`
`53`		`- return self.__dict__.keys() # type: ignore[return-value]`
	`53`	`+ return list(self.__dict__)`