Automated Mypy version sync (#69)

George-Ogden · web-flow · commit 91e18adc814d · 2026-04-05T16:31:00.000+01:00
Update Mypy version to 1.20.0
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -10,4 +10,4 @@ on:
 
 jobs:
   run-prek:
-    uses: George-Ogden/actions/.github/workflows/lint.yaml@v4.0.2
+    uses: George-Ogden/actions/.github/workflows/lint.yaml@v4.3.0
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -11,6 +11,6 @@ permissions:
 
 jobs:
   tag-and-release:
-    uses: George-Ogden/actions/.github/workflows/python-release.yaml@v4.0.2
+    uses: George-Ogden/actions/.github/workflows/python-release.yaml@v4.3.0
     with:
       validation-code: "import mypy.version; from mypy_pytest_plugin import plugin; plugin(mypy.version.__version__)"
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         shard: [0, 1, 2]
         total-shards: [3]
-    uses: George-Ogden/actions/.github/workflows/python-test.yaml@v4.0.2
+    uses: George-Ogden/actions/.github/workflows/python-test.yaml@v4.3.0
     with:
       python-versions: "['3.12', '3.13', '3.14']"
       timeout-minutes: 15
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ out.txt
 stderr.txt
 err.txt
 notes.txt
+refactor.list
 profile*.svg
 TODO
 *.pseudo
@@ -22,6 +23,9 @@ nohup*
 # Built Visual Studio Code Extensions
 *.vsix
 
+### PyCharm ###
+.idea/
+
 ### Python ###
 # Byte-compiled / optimized / DLL files
 __pycache__/
diff --git a/.mirror.lock b/.mirror.lock
@@ -1,5 +1,5 @@
 # DANGER: EDIT AT YOUR OWN RISK. Track this file in version control so that others can sync files correctly.
-- commit: fcb7c4aabba41339f8d81aa8b3a16dc3dd22a347
+- commit: 0fd8794e44ce1024bc27fbaab173c9cba1f6311a
   files:
   - .github/python-release.yaml
   - .github/python-test.yaml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,6 @@
 default_stages: [pre-commit]
-default_install_hook_types: [pre-commit, prepare-commit-msg, commit-msg]
+default_install_hook_types:
+  [pre-commit, prepare-commit-msg, commit-msg, post-commit, pre-push]
 
 ci:
   skip:
@@ -8,7 +9,7 @@ ci:
 
 repos:
   - repo: https://github.com/George-Ogden/mirror-rorrim/
-    rev: v0.4.5
+    rev: v0.4.9
     hooks:
       - id: mirror-check
         fail_fast: true
@@ -24,7 +25,7 @@ repos:
       - id: requirements-txt-fixer
 
   - repo: https://github.com/George-Ogden/linter/
-    rev: v2.1.0
+    rev: v2.1.1
     hooks:
       - id: lint
         args: [--fix]
@@ -36,7 +37,7 @@ repos:
         args: [--severity=warning]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit/
-    rev: v0.15.4
+    rev: v0.15.9
     hooks:
       - id: ruff-check
         args: [--fix]
@@ -50,17 +51,17 @@ repos:
       - id: prettier
 
   - repo: https://github.com/rhysd/actionlint/
-    rev: v1.7.11
+    rev: v1.7.12
     hooks:
       - id: actionlint
 
   - repo: https://github.com/codespell-project/codespell/
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
 
   - repo: https://github.com/George-Ogden/pre-commit-hooks/
-    rev: v2.4.0
+    rev: v3.1.0
     hooks:
       - id: check-merge-conflict
       - id: dbg-check
diff --git a/mypy.ini b/mypy.ini
@@ -7,7 +7,8 @@ warn_unused_ignores = true
 warn_unused_configs = true
 strict_equality = true
 exclude_gitignore = true
-plugins = plugin.py, mypy.plugins.proper_plugin
+warn_redundant_casts = true
+plugins = plugin.py, mypy.plugins.proper_plugin, utils.plugins.mypy_plugin
 
 [xdist.*]
 ignore_missing_imports = true
diff --git a/mypy_pytest_plugin/checker_wrapper.py b/mypy_pytest_plugin/checker_wrapper.py
@@ -17,8 +17,8 @@ class CheckerWrapper(abc.ABC):
     @abc.abstractmethod
     def __init__(self) -> None: ...
 
-    def fail(self, msg: str, *, context: Context, code: ErrorCode, file: str | None = None) -> None:
-        self.checker.msg.fail(msg, context=context, code=code, file=file)
+    def fail(self, msg: str, *, context: Context, code: ErrorCode) -> None:
+        self.checker.fail(msg, context=context, code=code)
 
     def note(self, msg: str, *, context: Context, code: ErrorCode | None) -> None:
         self.checker.note(msg, context=context, code=code)
diff --git a/mypy_pytest_plugin/fixture.py b/mypy_pytest_plugin/fixture.py
@@ -3,7 +3,7 @@
 from collections.abc import Collection, Sequence
 from dataclasses import dataclass
 import enum
-from typing import ClassVar, Final, Self, cast
+from typing import ClassVar, Final, Self
 
 from mypy.checker import TypeChecker
 from mypy.nodes import GDEF, CallExpr, Context, Decorator, Expression, FuncDef, SymbolTableNode, Var
@@ -273,7 +273,7 @@ def _fixture_scope_from_call(self, call: CallExpr) -> FixtureScope:
 
     def _fixture_scope_from_type(self, type_: Type, context: Context) -> FixtureScope:
         if isinstance(type_, LiteralType) and type_.value in FixtureScope._member_names_:
-            return FixtureScope[cast(str, type_.value)]
+            return FixtureScope[type_.value]
         self.fail("Invalid type for fixture scope.", context=context, code=INVALID_FIXTURE_SCOPE)
 
         return FixtureScope.unknown
diff --git a/mypy_pytest_plugin/fixture_manager_test.py b/mypy_pytest_plugin/fixture_manager_test.py
@@ -80,6 +80,7 @@ def test_fixture_manager_default_fixture_module_names() -> None:
             "_pytest.subtests",
             "_pytest.tmpdir",
             "inline_snapshot.pytest_plugin",
+            "utils.plugins.pytest_plugin",
             "xdist.plugin",
         ]
     )
diff --git a/mypy_pytest_plugin/patch_call_checker_test.py b/mypy_pytest_plugin/patch_call_checker_test.py
@@ -162,7 +162,7 @@ def original(x: int, y: str, /) -> bool:
             return False
         """,
         snapshot(
-            "mypy_pytest_plugin_types.mock._patcher[mypy_pytest_plugin_types.mock.Mock[[builtins.int, builtins.str], builtins.bool], def (builtins.int, builtins.str) -> builtins.bool]"
+            "mypy_pytest_plugin_types.mock._patcher[mypy_pytest_plugin_types.mock.Mock[[int, str], bool], def (int, str) -> bool]"
         ),
     )
 
@@ -174,7 +174,7 @@ def original(x: int, /, *, y: str) -> bool:
             return False
         """,
         snapshot(
-            "mypy_pytest_plugin_types.mock._patcher[mypy_pytest_plugin_types.mock.Mock[[builtins.int, *, y: builtins.str], builtins.bool], def (builtins.int, *, y: builtins.str) -> builtins.bool]"
+            "mypy_pytest_plugin_types.mock._patcher[mypy_pytest_plugin_types.mock.Mock[[int, *, y: str], bool], def (int, *, y: str) -> bool]"
         ),
     )
 
@@ -196,7 +196,7 @@ def original(**kwargs: Any) -> Any:
             ...
         """,
         snapshot(
-            "mypy_pytest_plugin_types.mock._patcher[Overload(def (*, x: builtins.int) -> builtins.int, def (*, y: builtins.str) -> builtins.str), Overload(def (*, x: builtins.int) -> builtins.int, def (*, y: builtins.str) -> builtins.str)]"
+            "mypy_pytest_plugin_types.mock._patcher[Overload(def (*, x: int) -> int, def (*, y: str) -> str), Overload(def (*, x: int) -> int, def (*, y: str) -> str)]"
         ),
     )
 
@@ -207,6 +207,6 @@ def test_specialized_patcher_type_object_type() -> None:
         original: int
         """,
         snapshot(
-            "mypy_pytest_plugin_types.mock._patcher[mypy_pytest_plugin_types.mock.MagicMock[Any, Any], builtins.int]"
+            "mypy_pytest_plugin_types.mock._patcher[mypy_pytest_plugin_types.mock.MagicMock[Any, Any], int]"
         ),
     )
diff --git a/mypy_pytest_plugin/plugin.py b/mypy_pytest_plugin/plugin.py
@@ -31,6 +31,7 @@ def __init__(self, options: Options) -> None:
             options.per_module_options.setdefault(module_pattern, {})["ignore_missing_imports"] = (
                 True
             )
+        options.warn_unused_configs = False
         options.per_module_options.setdefault("mypy_pytest_plugin_types.*", {})[
             "disallow_subclassing_any"
         ] = False
diff --git a/mypy_pytest_plugin/request_graph.py b/mypy_pytest_plugin/request_graph.py
@@ -159,13 +159,12 @@ def _check_resolved(self) -> None:
                 suffix = (
                     ""
                     if request.source == "argument"
-                    else f" (requested in {str(self.fullname)!r})"
+                    else f" (requested by {request.source_name} at {request.location})"
                 )
                 self.fail(
                     f"Argname {request.name!r} cannot be resolved{suffix}.",
-                    context=request.context,
+                    context=self.context,
                     code=MISSING_ARGNAME,
-                    file=request.file,
                 )
                 self._check_unmarked_fixture(request.name)
 
@@ -179,12 +178,12 @@ def _check_unmarked_fixture(self, fixture_name: str) -> None:
                 ),
             )
             if result is not None:
-                module, node = result
+                _module, node = result
                 if isinstance(node.type, CallableType):
-                    self.checker.msg.note(
+                    self.note(
                         f"{fixture_name!r} is defined in '{module_name}', but not marked as a fixture.",
-                        context=node,
-                        file=module.path,
+                        context=self.context,
+                        code=None,
                     )
 
     def _check_scope(self) -> None:
@@ -194,10 +193,9 @@ def _check_scope(self) -> None:
                 and request.scope > request.resolver.scope
                 and FixtureScope.unknown not in [request.scope, request.resolver.scope]
             ):
-                self.checker.msg.fail(
-                    f"{request.source_name!r} (scope={request.scope.name!r}) requests {request.name!r} (scope={request.resolver.scope.name!r}).",
-                    context=request.context,
-                    file=request.file,
+                self.fail(
+                    f"{request.source_name!r} (scope={request.scope.name!r}) requests {request.name!r} (scope={request.resolver.scope.name!r}).{request.suffix}",
+                    context=self.context,
                     code=INVERTED_FIXTURE_SCOPE,
                 )
 
@@ -206,10 +204,8 @@ def _check_request_types(self) -> None:
             if isinstance(request.resolver, Fixture) and not is_subtype(
                 request.resolver.return_type, request.type_
             ):
-                self.checker.msg.fail(
-                    f"{request.source_name!r} requests {request.name!r} with type {format_type(request.resolver.return_type, self.options)}, but expects type {format_type(request.type_, self.options)}. "
-                    f"This happens when executing {self.name!r}.",
-                    context=request.context,
-                    file=request.file,
+                self.fail(
+                    f"{request.source_name!r} requests {request.name!r} with type {format_type(request.resolver.return_type, self.options)}, but expects type {format_type(request.type_, self.options)}.{request.suffix}",
+                    context=self.context,
                     code=FIXTURE_ARGUMENT_TYPE,
                 )
diff --git a/mypy_pytest_plugin/request_node.py b/mypy_pytest_plugin/request_node.py
@@ -53,3 +53,17 @@ def context(self) -> Context:
     @property
     def type_variables(self) -> Sequence[TypeVarLikeType]:
         return self.request.type_variables
+
+    @property
+    def location(self) -> str:
+        """Display the location in a clickable format."""
+        return f"{self.file}:{self.context.line}"
+
+    @property
+    def suffix(self) -> str:
+        """Message to add after an error. This is non-empty if the source is a fixture, not a test."""
+        return (
+            ""
+            if self.source == "argument"
+            else f" ({self.source_name} defined at {self.location})."
+        )
diff --git a/mypy_pytest_plugin/test_signature.py b/mypy_pytest_plugin/test_signature.py
@@ -15,7 +15,7 @@ class TestSignature(abc.ABC):
     type_variables: Sequence[TypeVarLikeType]
 
     def _equal_names(self, other: object) -> TypeGuard[Self]:
-        return type(other) is type(self) and self.fn_name == cast(Self, other).fn_name
+        return type(other) is type(self) and cast(Self, self).fn_name == other.fn_name
 
     @abc.abstractmethod
     def __len__(self) -> int: ...
diff --git a/mypy_pytest_plugin/test_utils.py b/mypy_pytest_plugin/test_utils.py
@@ -136,7 +136,7 @@ def parse_multiple(modules: Sequence[tuple[str, str]], *, header: str = "") -> M
         if errors.is_errors():
             for info in errors.error_info_map.values():
                 for err in info:
-                    print(f"{err.file}:{err.line}: {err.message}")
+                    print(f"{module_name}:{err.line}: {err.message}")
             raise TypeError()
 
         defs: dict[str, Expression | FuncDef | Decorator] = {}
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,11 +1,12 @@
 -r requirements.txt
+georges-utils
 git+https://github.com/George-Ogden/mirror-rorrim; python_version >= "3.12"
-git+https://github.com/George-Ogden/mypy-pytest; python_version >= "3.12"
 git+https://github.com/George-Ogden/pytest-dbg; python_version >= "3.11"
 inline-snapshot
 prek
-pytest
+py-spy
+pytest>=9.0.0
 pytest-shard
 pytest-timeout
 pytest-xdist
-ruff
+ruff==0.15.9
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-mypy==1.19.1
+mypy==1.20.0
 pytest
diff --git a/test_samples/different_file_fixture_test.py b/test_samples/different_file_fixture_test.py
@@ -7,10 +7,6 @@ def base_int_fixture() -> str:
     return ""
 
 
-@pytest.mark.skip
-def test_valid_indirect_int_fixture(indirect_int_fixture: int) -> None: ...
-
-
 @pytest.mark.skip
 def test_invalid_indirect_int_fixture(indirect_int_fixture: int, base_int_fixture: str) -> None: ...
 
diff --git a/tests/mypy_test.py b/tests/mypy_test.py
@@ -1,6 +1,6 @@
 from glob import glob
 import operator
-import os
+import os.path
 from pathlib import Path
 import sys
 
@@ -15,8 +15,9 @@
 def test_check_files(filepath: Path) -> None:
     sys.modules.pop("plugin", None)  # required for plugin to work correctly
     stdout, stderr, _exit_code = mypy.api.run(
-        [str(filepath), "--cache-dir", os.devnull, "--show-traceback"]
+        [str(filepath), "--cache-dir", os.devnull, "--show-traceback", "--no-warn-redundant-casts"]
     )
+    stdout = stdout.replace(os.getcwd(), "[CWD]")
     assert stderr == "", stderr
     stdout_snapshot_file = "snapshots" / filepath.with_suffix(".txt")
     assert stdout == external_file(stdout_snapshot_file)
diff --git a/tests/snapshots/test_samples/autouse_test.txt b/tests/snapshots/test_samples/autouse_test.txt
@@ -1,16 +1,18 @@
-test_samples/conftest.py:28: error: 'autouse_fixture' (scope='module') requests 'autouse_request' (scope='function').  [inverted-fixture-scope]
-test_samples/autouse_test.py:10: error: 'request_autouse_fixture' (scope='package') requests 'autouse_request' (scope='function').  [inverted-fixture-scope]
-test_samples/conftest.py:28: error: 'autouse_fixture' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_direct_request_autouse_fixture'.  [fixture-arg-type]
-test_samples/autouse_test.py:10: error: 'request_autouse_fixture' requests 'autouse_request' with type "str", but expects type "int". This happens when executing 'test_direct_request_autouse_fixture'.  [fixture-arg-type]
-test_samples/autouse_test.py:31: error: 'late_autouse_request' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_direct_request_autouse_fixture'.  [fixture-arg-type]
-test_samples/conftest.py:24: error: 'autouse_request' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_direct_request_autouse_fixture'.  [fixture-arg-type]
+test_samples/autouse_test.py:17: error: 'autouse_fixture' (scope='module') requests 'autouse_request' (scope='function'). (autouse_fixture defined at [CWD]/test_samples/conftest.py:28).  [inverted-fixture-scope]
+test_samples/autouse_test.py:17: error: 'request_autouse_fixture' (scope='package') requests 'autouse_request' (scope='function'). (request_autouse_fixture defined at test_samples/autouse_test.py:10).  [inverted-fixture-scope]
+test_samples/autouse_test.py:17: error: 'autouse_fixture' requests 'autouse_request' with type "str", but expects type "None". (autouse_fixture defined at [CWD]/test_samples/conftest.py:28).  [fixture-arg-type]
+test_samples/autouse_test.py:17: error: 'request_autouse_fixture' requests 'autouse_request' with type "str", but expects type "int". (request_autouse_fixture defined at test_samples/autouse_test.py:10).  [fixture-arg-type]
+test_samples/autouse_test.py:17: error: 'late_autouse_request' requests 'autouse_request' with type "str", but expects type "None". (late_autouse_request defined at test_samples/autouse_test.py:31).  [fixture-arg-type]
+test_samples/autouse_test.py:17: error: 'autouse_request' requests 'autouse_request' with type "str", but expects type "None". (autouse_request defined at [CWD]/test_samples/conftest.py:24).  [fixture-arg-type]
 test_samples/autouse_test.py:22: error: Argument 1 has incompatible type "tuple[()]"; expected "ParameterSet[None] | None"  [arg-type]
-test_samples/autouse_test.py:35: error: Argname 'normal_request' cannot be resolved (requested in 'autouse_test.test_late_autouse_request_pre').  [missing-argname]
-test_samples/autouse_test.py:31: error: 'late_autouse_request' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_late_autouse_request_pre'.  [fixture-arg-type]
-test_samples/conftest.py:24: error: 'autouse_request' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_late_autouse_request_pre'.  [fixture-arg-type]
-test_samples/conftest.py:28: error: 'autouse_fixture' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_late_autouse_request_pre'.  [fixture-arg-type]
-test_samples/autouse_test.py:35: error: Argname 'normal_request' cannot be resolved (requested in 'autouse_test.test_late_autouse_request_post').  [missing-argname]
-test_samples/autouse_test.py:31: error: 'late_autouse_request' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_late_autouse_request_post'.  [fixture-arg-type]
-test_samples/conftest.py:24: error: 'autouse_request' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_late_autouse_request_post'.  [fixture-arg-type]
-test_samples/conftest.py:28: error: 'autouse_fixture' requests 'autouse_request' with type "str", but expects type "None". This happens when executing 'test_late_autouse_request_post'.  [fixture-arg-type]
-Found 15 errors in 2 files (checked 1 source file)
+test_samples/autouse_test.py:27: error: Argname 'normal_request' cannot be resolved (requested by late_fixture at test_samples/autouse_test.py:35).  [missing-argname]
+test_samples/autouse_test.py:27: error: 'autouse_fixture' (scope='module') requests 'autouse_request' (scope='function'). (autouse_fixture defined at [CWD]/test_samples/conftest.py:28).  [inverted-fixture-scope]
+test_samples/autouse_test.py:27: error: 'late_autouse_request' requests 'autouse_request' with type "str", but expects type "None". (late_autouse_request defined at test_samples/autouse_test.py:31).  [fixture-arg-type]
+test_samples/autouse_test.py:27: error: 'autouse_request' requests 'autouse_request' with type "str", but expects type "None". (autouse_request defined at [CWD]/test_samples/conftest.py:24).  [fixture-arg-type]
+test_samples/autouse_test.py:27: error: 'autouse_fixture' requests 'autouse_request' with type "str", but expects type "None". (autouse_fixture defined at [CWD]/test_samples/conftest.py:28).  [fixture-arg-type]
+test_samples/autouse_test.py:39: error: Argname 'normal_request' cannot be resolved (requested by late_fixture at test_samples/autouse_test.py:35).  [missing-argname]
+test_samples/autouse_test.py:39: error: 'autouse_fixture' (scope='module') requests 'autouse_request' (scope='function'). (autouse_fixture defined at [CWD]/test_samples/conftest.py:28).  [inverted-fixture-scope]
+test_samples/autouse_test.py:39: error: 'late_autouse_request' requests 'autouse_request' with type "str", but expects type "None". (late_autouse_request defined at test_samples/autouse_test.py:31).  [fixture-arg-type]
+test_samples/autouse_test.py:39: error: 'autouse_request' requests 'autouse_request' with type "str", but expects type "None". (autouse_request defined at [CWD]/test_samples/conftest.py:24).  [fixture-arg-type]
+test_samples/autouse_test.py:39: error: 'autouse_fixture' requests 'autouse_request' with type "str", but expects type "None". (autouse_fixture defined at [CWD]/test_samples/conftest.py:28).  [fixture-arg-type]
+Found 17 errors in 1 file (checked 1 source file)
diff --git a/tests/snapshots/test_samples/cyclic_test.txt b/tests/snapshots/test_samples/cyclic_test.txt
diff --git a/tests/snapshots/test_samples/different_file_fixture_test.txt b/tests/snapshots/test_samples/different_file_fixture_test.txt
diff --git a/tests/snapshots/test_samples/generator_fixture_test.txt b/tests/snapshots/test_samples/generator_fixture_test.txt
diff --git a/tests/snapshots/test_samples/invalid_test.txt b/tests/snapshots/test_samples/invalid_test.txt
diff --git a/tests/snapshots/test_samples/pytest_stubs_test.txt b/tests/snapshots/test_samples/pytest_stubs_test.txt
diff --git a/tests/snapshots/test_samples/same_file_fixture_test.txt b/tests/snapshots/test_samples/same_file_fixture_test.txt
diff --git a/tests/snapshots/test_samples/usefixtures_test.txt b/tests/snapshots/test_samples/usefixtures_test.txt
diff --git a/tests/snapshots/test_samples/valid_test.txt b/tests/snapshots/test_samples/valid_test.txt
diff --git a/version.txt b/version.txt

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ def test_fixture_manager_default_fixture_module_names() -> None:`
`80`	`80`	`"_pytest.subtests",`
`81`	`81`	`"_pytest.tmpdir",`
`82`	`82`	`"inline_snapshot.pytest_plugin",`
	`83`	`+ "utils.plugins.pytest_plugin",`
`83`	`84`	`"xdist.plugin",`
`84`	`85`	`]`
`85`	`86`	`)`