chore: adjust typing to be ready for next mypy release (#1088)

This types better on 1.16 (will need a few more adjustments when it
comes out, but this is closer). See
hauntsaninja/mypy_primer#174 and
python/mypy#19139.

Signed-off-by: Henry Schreiner <[email protected]>

Author: henryiii

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
         exclude: "^tests"
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.11.11
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
@@ -131,7 +131,7 @@ repos:
         additional_dependencies: [cogapp]
 
   - repo: https://github.com/henryiii/validate-pyproject-schema-store
-    rev: 2025.04.28
+    rev: 2025.05.12
     hooks:
       - id: validate-pyproject
 

pyproject.toml

@@ -174,6 +174,7 @@ exclude = [
     '^tests/packages/simplest_c/src/simplest/__init__.py',
     '^tests/packages/dynamic_metadata/src/dynamic/__init__.py',
     '^tests/packages/.*/setup.py',
+    '^tests/packages/extensionlib/*',
 ]
 mypy_path = ["$MYPY_CONFIG_FILE_DIR/src", "$MYPY_CONFIG_FILE_DIR/tests/utils"]
 python_version = "3.8"

src/scikit_build_core/file_api/reply.py

@@ -93,7 +93,7 @@ def _convert_any(self, item: Any, target: Type[T]) -> T: ...
     def _convert_any(self, item: Any, target: Any) -> Any: ...
 
     def _convert_any(self, item: Any, target: Union[Type[T], Any]) -> Any:
-        if isinstance(target, type) and dataclasses.is_dataclass(target):
+        if dataclasses.is_dataclass(target) and isinstance(target, type):
             # We don't have DataclassInstance exposed in typing yet
             return self.make_class(item, target)
         origin = get_origin(target)
@@ -103,7 +103,7 @@ def _convert_any(self, item: Any, target: Union[Type[T], Any]) -> Any:
             if origin is Union:
                 return self._convert_any(item, get_args(target)[0])
 
-        return target(item)
+        return target(item)  # type: ignore[call-arg]
 
 
 def load_reply_dir(path: Path) -> Index:

src/scikit_build_core/settings/documentation.py

@@ -101,13 +101,13 @@ def mk_docs(dc: type[object], prefix: str = "") -> Generator[DCDoc, None, None]:
 
     for field in dataclasses.fields(dc):
         field_type = field.type
-        if isinstance(field_type, type) and dataclasses.is_dataclass(field_type):
+        if dataclasses.is_dataclass(field_type) and isinstance(field_type, type):
             yield from mk_docs(field_type, prefix=f"{prefix}{field.name}.")
             continue
 
         if get_origin(field.type) is list:
             field_type = get_args(field.type)[0]
-            if isinstance(field_type, type) and dataclasses.is_dataclass(field_type):
+            if dataclasses.is_dataclass(field_type) and isinstance(field_type, type):
                 yield from mk_docs(field_type, prefix=f"{prefix}{field.name}[].")
                 continue
 

src/scikit_build_core/settings/json_schema.py

@@ -30,7 +30,7 @@ def to_json_schema(dclass: type[Any], *, normalize_keys: bool) -> dict[str, Any]
     required = []
     for field in dataclasses.fields(dclass):
         field_type = field.type
-        if isinstance(field_type, type) and dataclasses.is_dataclass(field.type):
+        if dataclasses.is_dataclass(field.type) and isinstance(field_type, type):
             props[field.name] = to_json_schema(
                 field_type, normalize_keys=normalize_keys
             )
@@ -113,7 +113,7 @@ def to_json_schema(dclass: type[Any], *, normalize_keys: bool) -> dict[str, Any]
 
 
 def convert_type(t: Any, *, normalize_keys: bool) -> dict[str, Any]:
-    if isinstance(t, type) and dataclasses.is_dataclass(t):
+    if dataclasses.is_dataclass(t) and isinstance(t, type):
         return to_json_schema(t, normalize_keys=normalize_keys)
     if t is str or t is Path or t is Version or t is SpecifierSet:
         return {"type": "string"}

src/scikit_build_core/settings/sources.py

@@ -158,7 +158,7 @@ def _nested_dataclass_to_names(
     Yields each entry, like ``("a", "b", "c")`` for ``a.b.c``.
     """
 
-    if isinstance(target, type) and dataclasses.is_dataclass(target):
+    if dataclasses.is_dataclass(target) and isinstance(target, type):
         for field in dataclasses.fields(target):
             yield from _nested_dataclass_to_names(field.type, *inner, field.name)
     else:
@@ -324,7 +324,7 @@ def _unrecognized_dict(
             continue
         (inner_option_field,) = matches
         inner_option = inner_option_field.type
-        if isinstance(inner_option, type) and dataclasses.is_dataclass(inner_option):
+        if dataclasses.is_dataclass(inner_option) and isinstance(inner_option, type):
             yield from _unrecognized_dict(
                 settings[keystr], inner_option, (*above, keystr)
             )
@@ -492,7 +492,7 @@ def convert(cls, item: Any, target: type[Any] | Any) -> object:
         """
         target, annotations = _process_annotated(target)
         raw_target = _get_target_raw_type(target)
-        if isinstance(raw_target, type) and dataclasses.is_dataclass(raw_target):
+        if dataclasses.is_dataclass(raw_target) and isinstance(raw_target, type):
             fields = dataclasses.fields(raw_target)
             values = ((k.replace("-", "_"), v) for k, v in item.items())
             return raw_target(
@@ -581,7 +581,7 @@ def convert_target(self, target: type[T], *prefixes: str) -> T:
         errors = []
         prep: dict[str, Any] = {}
         for field in dataclasses.fields(target):  # type: ignore[arg-type]
-            if isinstance(field.type, type) and dataclasses.is_dataclass(field.type):
+            if dataclasses.is_dataclass(field.type) and isinstance(field.type, type):
                 try:
                     prep[field.name] = self.convert_target(
                         field.type, *prefixes, field.name