address mypy and ruff concerns

Author: 2bndy5

sphinx_immaterial/__init__.py

@@ -2,7 +2,7 @@
 
 import os
 import re
-from typing import Dict, List, Mapping, Optional, Type, cast
+from typing import Dict, Mapping, Optional, Type, cast
 from urllib.parse import urlparse
 
 import docutils.nodes
@@ -18,6 +18,14 @@
 from sphinx.application import Sphinx
 from sphinxcontrib.serializinghtml import JSONHTMLBuilder
 
+if version_info < (7, 2):
+    from sphinx.builders.html import JavaScript  # type: ignore[attr-defined]
+    from sphinx.builders.html import (  # type: ignore[attr-defined]
+        Stylesheet as StyleSheet,
+    )
+else:
+    from sphinx.builders.html._assets import _CascadingStyleSheet as StyleSheet
+    from sphinx.builders.html._assets import _JavaScript as JavaScript
 from . import (
     html_translator_mixin,
     json_builder_serializing_implementation,
@@ -62,9 +70,9 @@ def _get_html_builder(base_builder: Type[sphinx.builders.html.StandaloneHTMLBuil
 
     class CustomHTMLBuilder(base_builder):  # type: ignore
         if version_info < (7, 2):
-            css_files: List[sphinx.builders.html.Stylesheet]
+            css_files: list[StyleSheet]
         else:
-            _css_files: List[sphinx.builders.html._assets._CascadingStyleSheet]  # type: ignore[name-defined]
+            _css_files: list[StyleSheet]  # type: ignore[name-defined]
         theme: sphinx.theming.Theme
         templates: sphinx.jinja2glue.BuiltinTemplateLoader
 
@@ -98,11 +106,11 @@ def init_js_files(self):
                 excluded_scripts.add("_static/jquery.js")
                 excluded_scripts.add("_static/_sphinx_javascript_frameworks_compat.js")
             if version_info < (7, 2):
-                self.script_files: List[sphinx.builders.html.JavaScript] = [
+                self.script_files: list[JavaScript] = [
                     x for x in self.script_files if x.filename not in excluded_scripts
                 ]
             else:
-                self._js_files: List[sphinx.builders.html._assets._JavaScript] = [  # type: ignore[name-defined]
+                self._js_files: list[JavaScript] = [  # type: ignore[name-defined]
                     x for x in self._js_files if x.filename not in excluded_scripts
                 ]
 
@@ -121,14 +129,14 @@ def init_css_files(self):
             if version_info < (7, 2):
                 self.css_files = [
                     x
-                    for x in cast(List[sphinx.builders.html.Stylesheet], self.css_files)
+                    for x in cast(list[StyleSheet], self.css_files)
                     if x.filename not in excluded
                 ]
             else:
                 self._css_files = [
                     x
                     for x in cast(
-                        List[sphinx.builders.html._assets._CascadingStyleSheet],  # type: ignore[name-defined]
+                        list[StyleSheet],  # type: ignore[name-defined]
                         self._css_files,
                     )
                     if x.filename not in excluded

sphinx_immaterial/apidoc/json/domain.py

@@ -693,7 +693,7 @@ def _add_sub_schema(
         return sphinx_utils.parse_rst(
             self.state,
             sphinx_utils.format_directive("json:schema", entry.id, options=kwargs),
-            *self.get_source_info(),
+            *cast(tuple[str, int], self.get_source_info()),
         )
 
     def _make_field(
@@ -1107,7 +1107,7 @@ class JsonSchemaDomain(sphinx.domains.Domain):
         "schema": JsonSchemaRole(warn_dangling=True),
     }
 
-    object_types: Dict[str, sphinx.domains.ObjType] = {
+    object_types: Dict[str, sphinx.domains.ObjType] = {  # type: ignore[misc]
         "schema": sphinx.domains.ObjType("type", "schema"),
         "subschema": sphinx.domains.ObjType("member", "schema"),
     }
@@ -1116,7 +1116,7 @@ class JsonSchemaDomain(sphinx.domains.Domain):
         "schema": JsonSchemaDirective,
     }
 
-    initial_data: Dict[str, DomainSchemaEntry] = {
+    initial_data: Dict[str, DomainSchemaEntry] = {  # type: ignore[misc]
         "schemas": cast(DomainSchemaEntry, {}),
     }
 

sphinx_immaterial/apidoc/python/type_param_utils.py

@@ -155,8 +155,8 @@ def get_base_class_type_param_substitutions(
 }
 
 if sys.version_info >= (3, 10):
-    _ENCODE_TYPE_PARAM[typing.ParamSpec] = (
-        lambda annotation: TYPE_VAR_ANNOTATION_PREFIX + "P_" + annotation.__name__
+    _ENCODE_TYPE_PARAM[typing.ParamSpec] = lambda annotation: (
+        TYPE_VAR_ANNOTATION_PREFIX + "P_" + annotation.__name__
     )
     _DECODE_TYPE_PARAM["P"] = typing.ParamSpec
 if sys.version_info >= (3, 11):

tests/conftest.py

@@ -5,7 +5,7 @@
 import sphinx
 
 if sphinx.version_info < (7, 2):
-    from sphinx.testing.path import path as SphinxPath
+    from sphinx.testing.path import path as SphinxPath  # type: ignore[import-not-found]
 else:
     from pathlib import Path as SphinxPath  # type: ignore[assignment]
 

tests/python_apigen_test.py

@@ -14,7 +14,7 @@
 )
 
 if sphinx.version_info < (7, 2):
-    from sphinx.testing.path import path as SphinxPath
+    from sphinx.testing.path import path as SphinxPath  # type: ignore[import-not-found]
 else:
     from pathlib import Path as SphinxPath  # type: ignore[assignment]
 

tests/python_transform_type_annotations_test.py

@@ -7,7 +7,7 @@
 import sphinx.domains.python
 
 if sphinx.version_info < (7, 2):
-    from sphinx.testing.path import path as SphinxPath
+    from sphinx.testing.path import path as SphinxPath  # type: ignore[import-not-found]
 else:
     from pathlib import Path as SphinxPath  # type: ignore[assignment]