Merge branch 'master' into bep038

Author: effigies

tools/schemacode/pyproject.toml

@@ -131,6 +131,7 @@ filename = "../../src/schema/SCHEMA_VERSION"
 line-length = 99
 
 [tool.ruff.lint]
+typing-modules = ["bidsschematools._lazytypes"]
 select = [
   "E",   # pycodestyle errors
   "W",   # pycodestyle warnings

tools/schemacode/src/bidsschematools/_lazytypes.py

@@ -54,10 +54,9 @@ def func(arg: lt.Any) -> ReturnType:
 
 TYPE_CHECKING = False
 if TYPE_CHECKING or "sphinx.ext.autodoc" in sys.modules:  # pragma: no cover
-    from typing import Any, Callable, Literal, NotRequired, Protocol, Self, TypeVar, TypedDict
-
     from collections.abc import Iterator, Mapping
     from contextlib import AbstractContextManager
+    from typing import Any, Callable, Literal, NotRequired, Protocol, Self, TypedDict, TypeVar
 
     from acres.typ import Traversable
     from jsonschema import FormatChecker

tools/schemacode/src/bidsschematools/schema.py

@@ -10,11 +10,10 @@
 from functools import cache, lru_cache
 from pathlib import Path
 
+from . import _lazytypes as lt
 from . import data, utils
 from .types import Namespace
 
-from . import _lazytypes as lt
-
 lgr = utils.get_logger()
 
 

tools/schemacode/src/bidsschematools/utils.py

@@ -8,8 +8,8 @@
 import warnings
 from functools import wraps
 
-from . import data
 from . import _lazytypes as lt
+from . import data
 
 if lt.TYPE_CHECKING: