General cleanup

Ignore Pylance type errors which conflict with Mypy

Refine types to be more correct

Author: HexDecimal

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
   autoupdate_schedule: quarterly
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -17,7 +17,7 @@ repos:
       - id: fix-byte-order-marker
       - id: detect-private-key
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.6
+    rev: v0.9.10
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

.vscode/settings.json

@@ -4,12 +4,16 @@
     "files.insertFinalNewline": true,
     "files.trimTrailingWhitespace": true,
     "cSpell.words": [
+        "addopts",
         "automodule",
         "autoupdate",
         "autouse",
         "Benesch",
+        "buildapi",
         "cattrs",
         "codecov",
+        "docstrings",
+        "doctest",
         "doctests",
         "dtype",
         "furo",
@@ -22,19 +26,28 @@
         "liskin",
         "maxdepth",
         "Mertens",
+        "minversion",
         "modindex",
         "Mypy",
+        "ncipollo",
         "Numpad",
         "PAGEDOWN",
         "PAGEUP",
         "pickleable",
+        "pydocstyle",
+        "pypa",
+        "pypi",
+        "pyright",
         "pytest",
         "quickstart",
         "RMASK",
         "rtype",
         "scancode",
         "setdefault",
+        "setuptools",
+        "subclassing",
         "tcod",
+        "testpaths",
         "toctree",
         "Traceback",
         "typehints",

pyproject.toml

@@ -66,6 +66,14 @@ warn_return_any = true
 no_implicit_reexport = true
 strict_equality = true
 
+[tool.pyright]
+reportInconsistentOverload = false
+reportIncompatibleMethodOverride = false
+reportAssignmentType = false
+reportCallIssue = false
+reportInvalidTypeVarUse = false
+reportArgumentType = false
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 required_plugins = ["pytest-cov>=4.0.0", "pytest-benchmark>=4.0.0"]
@@ -81,8 +89,6 @@ line-length = 120
 [tool.ruff.lint] # https://docs.astral.sh/ruff/rules/
 select = ["ALL"]
 ignore = [
-    "ANN101", # missing-type-self
-    "ANN102", # missing-type-cls
     "COM",    # flake8-commas, handled by formatter
     "E501",   # line-too-long
     "S101",   # assert

tcod/ecs/entity.py

@@ -66,7 +66,7 @@ class Entity:
         >>> other_entity = registry["other"]
     """  # Changes here should be reflected in conftest.py
 
-    __slots__ = ("registry", "uid", "__weakref__")
+    __slots__ = ("__weakref__", "registry", "uid")
 
     registry: Final[Registry]  # type:ignore[misc]  # https://github.com/python/mypy/issues/5774
     """The :any:`Registry` this entity belongs to."""
@@ -394,7 +394,7 @@ def _traverse_entities(start: Entity, traverse_parents: tuple[object, ...]) -> I
 
 
 @attrs.define(eq=False, frozen=True, weakref_slot=False)
-class EntityComponents(MutableMapping[Union[Type[Any], Tuple[object, Type[Any]]], Any]):
+class EntityComponents(MutableMapping[Union[Type[Any], Tuple[object, Type[Any]]], object]):
     """A proxy attribute to access an entities components like a dictionary.
 
     See :any:`Entity.components`.
@@ -552,7 +552,7 @@ def get(self, __key: ComponentKey[T], /, default: _T1 | None = None) -> T | _T1:
         except KeyError:
             return default  # type: ignore[return-value] # https://github.com/python/mypy/issues/3737
 
-    def setdefault(self, __key: ComponentKey[T], __default: T) -> T:  # type: ignore[override]
+    def setdefault(self, __key: ComponentKey[T], __default: T, /) -> T:
         """Assign a default value if a component is missing, then returns the current value."""
         try:
             return self[__key]
@@ -1040,7 +1040,7 @@ def __getitem__(self, key: ComponentKey[T]) -> EntityComponentRelationMapping[T]
         """Access relations for this component key as a `{target: component}` dict-like object."""
         return EntityComponentRelationMapping(self.entity, key, self.traverse)
 
-    def __setitem__(self, __key: ComponentKey[T], __values: Mapping[Entity, object]) -> None:
+    def __setitem__(self, __key: ComponentKey[T], __values: Mapping[Entity, object], /) -> None:
         """Redefine the component relations for this entity.
 
         ..versionadded:: 4.2.0

tcod/ecs/typing.py

@@ -1,4 +1,4 @@
-"""Common type-hints for tcod.ecs."""
+"""Common type-hints for tcod.ecs."""  # noqa: A005
 
 from __future__ import annotations
 

tests/test_traversal.py

@@ -215,3 +215,5 @@ def test_inherited_clear() -> None:
     world["A"].relation_tags["baz"] = world["B"]
     child = world["A"].instantiate()
     child.clear()  # Could hang if broken
+    x = child.components
+    x[int] = "asd"