chore(lint): Fix mypy analysis and lint tooling

Author: seandstewart

.pre-commit-config.yaml

@@ -1,45 +1,45 @@
 repos:
-- repo: https://github.com/astral-sh/ruff-pre-commit
-  # Ruff version.
-  rev: v0.9.4
-  hooks:
-  # Run the linter.
-  - id: ruff
-    types_or: [ python, pyi ]
-    args: [ --fix, --config=pyproject.toml ]
-    stages: [ pre-commit, manual ]
-  # Run the formatter.
-  - id: ruff-format
-    types_or: [ python, pyi ]
-    args: [ --config=pyproject.toml ]
-    stages: [ pre-commit, manual ]
-- repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.14.1
-  hooks:
-  - id: mypy
-    args: [ --config-file=pyproject.toml ]
-    additional_dependencies:
-    - types-python-dateutil
-    - types-setuptools
-    - types-toml
-    - types-typed-ast
-    - types-orjson
-    files: "src/.*"
-    stages: [ pre-commit, manual ]
-- repo: https://github.com/compilerla/conventional-pre-commit
-  rev: v4.0.0
-  hooks:
-    - id: conventional-pre-commit
-      stages: [commit-msg]
-      args: []
-- repo: https://github.com/astral-sh/uv-pre-commit
-  # uv version.
-  rev: 0.5.26
-  hooks:
-    - id: uv-sync
-      args: ["--locked", "--all-packages"]
-      stages:
-      - pre-commit
-      - post-checkout
-      - post-merge
-      - post-rewrite
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.13.0
+    hooks:
+      # Run the linter.
+      - id: ruff-check
+        types_or: [python, pyi]
+        args: [--fix, --config=pyproject.toml]
+        stages: [pre-commit, manual]
+      # Run the formatter.
+      - id: ruff-format
+        types_or: [python, pyi]
+        args: [--config=pyproject.toml]
+        stages: [pre-commit, manual]
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.18.1
+    hooks:
+      - id: mypy
+        args: [--config-file=pyproject.toml]
+        additional_dependencies:
+          - types-python-dateutil
+          - types-setuptools
+          - types-toml
+          - types-typed-ast
+          - types-orjson
+        files: "src/.*"
+        stages: [pre-commit, manual]
+  - repo: https://github.com/compilerla/conventional-pre-commit
+    rev: v4.2.0
+    hooks:
+      - id: conventional-pre-commit
+        stages: [commit-msg]
+        args: []
+  - repo: https://github.com/astral-sh/uv-pre-commit
+    # uv version.
+    rev: 0.8.17
+    hooks:
+      - id: uv-sync
+        args: ["--locked", "--all-packages"]
+        stages:
+          - pre-commit
+          - post-checkout
+          - post-merge
+          - post-rewrite

Makefile

@@ -10,7 +10,7 @@ RUN_PREFIX := uv run --
 # region: environment
 
 quickstart: setup-uv install  ## Bootstrap your local environment for development.
-.PHONY: bootstrap
+.PHONY: quickstart
 
 setup-uv:  ## Set up your poetry installation and ensure it's up-to-date.
 	@curl -LsSf https://astral.sh/uv/install.sh | sh

pyproject.toml

@@ -34,9 +34,8 @@ dependencies = [
     "importlib_metadata >=7.1.0,<8; python_version < '3.10'",
 ]
 [project.optional-dependencies]
-json = [
-    "orjson ~= 3.4",
-]
+json = ["orjson ~= 3.4"]
+
 [project.urls]
 Repository = "https://github.com/seandstewart/typelib"
 Homepage = "https://seandstewart.github.io/python-typelib/latest/"
@@ -48,9 +47,9 @@ dev = [
     { include-group = "lint" },
     { include-group = "test" },
     "orjson ~= 3.4",
-    "tox",
     "hatch-vcs",
     "git-cliff>=2.8.0",
+    "ipykernel>=6.29.5",
 ]
 docs = [
     "mkdocs-material[imaging]",
@@ -63,14 +62,8 @@ docs = [
     "mkdocs-literate-nav",
     "mkdocs-open-in-new-tab",
 ]
-lint = [
-    "pre-commit",
-]
-test = [
-    "pytest",
-    "pytest-cov",
-    "pytest-parametrize-suite",
-]
+lint = ["pre-commit", "pre-commit-uv"]
+test = ["pytest", "pytest-cov", "pytest-parametrize-suite"]
 
 [tool.hatch.version]
 source = "vcs"
@@ -81,14 +74,10 @@ version_scheme = "no-guess-dev"
 [tool.coverage.run]
 branch = true
 data_file = "coverage.db"
-include = [
-    "src/**/*",
-]
+include = ["src/**/*"]
 
 [tool.coverage.paths]
-source = [
-    "src/*",
-]
+source = ["src/*"]
 
 [tool.coverage.report]
 skip_empty = true
@@ -109,15 +98,9 @@ exclude_also = [
     "class\\s\\w+\\((typing\\.)?Protocol(\\[.*\\])?\\):",
     "@(abc\\.)?abstractmethod",
     "@(typing\\.)?overload",
-    ".*\\.\\.\\."
-]
-omit = [
-    "dist/*",
-    "tests/*",
-    "docs/*",
-    ".venv/*",
-    "benchmark/*",
+    ".*\\.\\.\\.",
 ]
+omit = ["dist/*", "tests/*", "docs/*", ".venv/*", "benchmark/*"]
 
 
 [tool.ruff.lint]
@@ -131,7 +114,7 @@ extend-select = [
     # flake8-simplify
     "SIM",
     # Future annotation
-    "FA"
+    "FA",
 ]
 
 [tool.ruff.lint.per-file-ignores]
@@ -144,9 +127,7 @@ extra-standard-library = ["typing_extensions", "graphlib"]
 
 [tool.mypy]
 mypy_path = "$MYPY_CONFIG_FILE_DIR/src/"
-no_namespace_packages = true
 python_version = "3.12"
 ignore_missing_imports = true
-no_strict_optional = true
 follow_imports = "silent"
 exclude = ".*tests/.*|.*docs/.*"

src/typelib/binding.py

@@ -209,8 +209,8 @@ def __init__(
         """
         self.signature = signature
         self.binding = binding
-        self.varkwd = varkwd
-        self.varpos = varpos
+        self.varkwd = varkwd or unmarshals.noop()
+        self.varpos = varpos or unmarshals.noop()
         self.startpos = startpos
 
     def __repr__(self):
@@ -219,7 +219,7 @@ def __repr__(self):
     @abc.abstractmethod
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         """Inspect the given `args` and `kwargs` and unmarshal them.
 
         Args:
@@ -231,7 +231,7 @@ def __call__(
 class AnyParamKindBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
@@ -254,7 +254,7 @@ def __call__(
 class PosArgsKwargsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
@@ -275,7 +275,7 @@ def __call__(
 class PosKwdKwargsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         varkwd: unmarshals.AbstractUnmarshaller = self.varkwd
@@ -289,7 +289,7 @@ def __call__(
 class PosKwdArgsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
@@ -311,7 +311,7 @@ def __call__(
 class PosKwargsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         varkwd: unmarshals.AbstractUnmarshaller = self.varkwd
@@ -325,7 +325,7 @@ def __call__(
 class PosKwdBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         # Unmarshal the args
@@ -338,7 +338,7 @@ def __call__(
 class PosArgsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
@@ -357,7 +357,7 @@ def __call__(
 class PosBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize key attributes
         binding = self.binding
         # Unmarshal the args
@@ -368,7 +368,7 @@ def __call__(
 class KwdArgsKwargsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize the key attributes
         binding = self.binding
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
@@ -383,7 +383,7 @@ def __call__(
 class KwdArgsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize the key attributes
         binding = self.binding
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
@@ -397,7 +397,7 @@ def __call__(
 class KwdKwargsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         binding = self.binding
         varkwd: unmarshals.AbstractUnmarshaller = self.varkwd
         # Unmarshal the keyword arguments.
@@ -408,7 +408,7 @@ def __call__(
 class KwdBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         binding = self.binding
         # Unmarshal the keyword arguments.
         umkwargs = {k: binding[k](v) if k in binding else k for k, v in kwargs.items()}
@@ -418,7 +418,7 @@ def __call__(
 class ArgsKwargsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize the key attributes
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
         varkwd: unmarshals.AbstractUnmarshaller = self.varkwd
@@ -432,7 +432,7 @@ def __call__(
 class KwargsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize the key attributes
         varkwd: unmarshals.AbstractUnmarshaller = self.varkwd
         # Unmarshal the keyword arguments.
@@ -443,7 +443,7 @@ def __call__(
 class ArgsBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize the key attributes
         varpos: unmarshals.AbstractUnmarshaller = self.varpos
         # Unmarshal the positional arguments.
@@ -454,7 +454,7 @@ def __call__(
 class PosOrKwdBinding(AbstractBinding[P], tp.Generic[P]):
     def __call__(
         self, args: tuple[tp.Any], kwargs: dict[str, tp.Any]
-    ) -> tuple[P.args, P.kwargs]:
+    ) -> tuple[P.args, P.kwargs]:  # type: ignore[valid-type]
         # Localize the key attributes
         binding = self.binding
         # Unmarshal the positional args.

src/typelib/ctx.py

@@ -16,7 +16,7 @@
 class TypeContext(dict[KeyT, ValueT], tp.Generic[ValueT]):
     """A key-value mapping which can map between forward references and real types."""
 
-    def get(self, key: KeyT, default: ValueT | DefaultT = None) -> ValueT | DefaultT:
+    def get(self, key: KeyT, default: ValueT | DefaultT = None) -> ValueT | DefaultT:  # type: ignore[assignment]
         with contextlib.suppress(KeyError):
             return self[key]
 

src/typelib/graph.py

@@ -171,9 +171,9 @@ def get_type_graph(t: type) -> graphlib.TopologicalSorter[TypeNode]:
 class TypeNode:
     """A "node" in a type graph."""
 
-    type: typing.Any
+    type: typing.Type | typing.ForwardRef
     """The type annotation for this node."""
-    unwrapped: typing.Any | None = None
+    unwrapped: typing.Type | typing.ForwardRef = None  # type: ignore[assignment]
     """The unwrapped type annotation for this node."""
     var: str | None = None
     """The variable or parameter name associated to the type annotation for this node."""
@@ -185,7 +185,9 @@ def __post_init__(self):
             self.unwrapped = self.type
 
 
-def _level(t: typing.Any) -> typing.Iterable[tuple[str | None, type]]:
+def _level(
+    t: typing.Any,
+) -> typing.Iterable[tuple[str | None, type | typing.ForwardRef]]:
     args = inspection.args(t)
     # Only pull annotations from the signature if this is a user-defined type.
     is_structured = inspection.isstructuredtype(t)