Resolve lint errors

Author: multiplemonomials

tools/pyproject.toml

@@ -210,7 +210,14 @@ ignore = [
     # back to Python 3.7, you can't actually use the new style of annotations without using the future annotations feature.
     "FA100",
     "UP045",
-    "UP006"
+    "UP006",
+    "UP007"
+]
+# Allow "unsafe" fixes to be done automatically for the following:
+extend-safe-fixes = [
+    "W291", # Trailing whitespace
+    "W293", # Whitespace on blank line
+    "EM101",# Exception message must be assigned to variable
 ]
 
 [tool.ruff.lint.mccabe]

tools/python/mbed_tools/build/_internal/config/assemble_build_config.py

@@ -6,21 +6,18 @@
 
 from __future__ import annotations
 
-import itertools
 import logging
-
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Iterable, List, Optional, Set
 
 import pydantic
-from setuptools.build_meta import build_editable
 
-from mbed_tools.build._internal.config.schemas import MbedAppJSON
-from mbed_tools.lib.json_helpers import decode_json_file
-from mbed_tools.project import MbedProgram
+from mbed_tools.build._internal.config import source
 from mbed_tools.build._internal.config.config import Config
+from mbed_tools.build._internal.config.schemas import MbedAppJSON
 from mbed_tools.build._internal.find_files import LabelFilter, filter_files, find_files
+from mbed_tools.lib.json_helpers import decode_json_file
 from mbed_tools.project import MbedProgram
 
 logger = logging.getLogger(__name__)
@@ -98,12 +95,12 @@ def _assemble_config_from_sources(
         # if it does not pass the schema. This provides compatibility with older projects, as mbed_app.json has
         # historically been a total wild west where any internal Mbed state could potentially be overridden.
         try:
-            MbedAppJSON.model_validate(mbed_app_json_dict, strict=True)
+            _ = MbedAppJSON.model_validate(mbed_app_json_dict, strict=True)
         except pydantic.ValidationError as ex:
             logger.warning(
                 "mbed_app.json5 failed to validate against the schema. This likely means it contains deprecated attributes, misspelled attributes, or overrides for things that should not be set in mbed_app.json5. This version of mbed-os still allows this, but this will change in the future."
             )
-            logger.warning("Error was: " + str(ex))
+            logger.warning("Error was: %s", str(ex))
 
         app_data = source.prepare(
             "mbed_app.json5", mbed_app_json_dict, source_name="app", target_filters=filter_data.labels
@@ -123,7 +120,7 @@ class FileFilterData:
     requires: Set[str]
 
     @classmethod
-    def from_config(cls, config: Config) -> "FileFilterData":
+    def from_config(cls, config: Config) -> FileFilterData:
         """Extract file filters from a Config object."""
         return cls(
             labels=config.get("labels", set()) | config.get("extra_labels", set()),

tools/python/mbed_tools/build/_internal/config/config.py

@@ -62,7 +62,7 @@ def _handle_overrides(self, overrides: Iterable[Override]) -> None:
                 _apply_override(self.data, override)
                 continue
 
-            setting: ConfigSetting = next(
+            setting: ConfigSetting | None = next(
                 filter(
                     lambda x: x.name == override.name and x.namespace == override.namespace,
                     self.data.get(CONFIG_SECTION, []),