Merge pull request #6560 from opsmill/pog-ruf036

Linting: RUF036 `None` not at the end of the type annotation

Author: ogenstad

backend/infrahub/core/schema/basenode_schema.py

@@ -386,7 +386,7 @@ def generate_fields_for_display_label(self) -> dict | None:
         if not self.display_labels:
             return None
 
-        fields: dict[str, str | None | dict[str, None]] = {}
+        fields: dict[str, str | dict[str, None] | None] = {}
         for item in self.display_labels:
             fields.update(self.convert_path_to_graphql_fields(path=item))
         return fields
@@ -401,7 +401,7 @@ def generate_fields_for_hfid(self) -> dict | None:
         if not self.human_friendly_id:
             return None
 
-        fields: dict[str, str | None | dict[str, None]] = {}
+        fields: dict[str, str | dict[str, None] | None] = {}
         for item in self.human_friendly_id:
             fields.update(self.convert_path_to_graphql_fields(path=item))
         return fields

backend/infrahub/core/schema/schema_branch.py

@@ -453,7 +453,7 @@ def generate_fields_for_display_label(self, name: str) -> dict | None:
         if isinstance(node, NodeSchema | ProfileSchema | TemplateSchema):
             return node.generate_fields_for_display_label()
 
-        fields: dict[str, str | None | dict[str, None]] = {}
+        fields: dict[str, str | dict[str, None] | None] = {}
         if isinstance(node, GenericSchema):
             for child_node_name in node.used_by:
                 child_node = self.get(name=child_node_name, duplicate=False)

pyproject.toml

@@ -547,7 +547,6 @@ ignore = [
     "RUF012",  # Mutable class attributes should be annotated with `typing.ClassVar`
     "RUF015",  # Prefer `next(...)` over single element slice
     "RUF029",  # Function is declared `async`, but doesn't `await` or use `async` features.
-    "RUF036",  # `None` not at the end of the type annotation.
     "RUF043",  # Pattern passed to `match=` contains metacharacters but is neither escaped nor raw
     "RUF052",  # Local dummy variable `_meta` is accessed
     "RUF100",  # [*] Unused `noqa` directive (non-enabled: `INP001`)