Update mypy to 1.15 and use --strict mode (#257)

Author: sobolevn

.pre-commit-config.yaml

@@ -54,7 +54,7 @@ repos:
     - flake8-builtins
     - flake8-comprehensions
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: f56614daa94d5cd733d3b7004c5df9caad267b4a  # frozen: v1.13.0
+  rev: f40886d54c729f533f864ed6ce584e920feb0af7  # frozen: v1.15.0
   hooks:
   - id: mypy
     args: ["--scripts-are-modules"]

pyproject.toml

@@ -145,16 +145,14 @@ exclude_lines = [
 [tool.mypy]
 show_error_codes = true
 warn_unreachable = true
-warn_unused_ignores = true
-warn_redundant_casts = true
-warn_unused_configs = true
-# Disabling incremental mode is required for `warn_unused_configs = true` to work
+strict = true
+strict_bytes = true
+local_partial_types = true
+# Disabling incremental mode is required for `warn_unused_configs = true`
+# (implied by `strict = true`) to work
 incremental = false
-disallow_untyped_defs = true
-check_untyped_defs = true
-strict_equality = true
-implicit_reexport = false
-no_implicit_optional = true
+
+enable_error_code = ["ignore-without-code"]
 
 [[tool.mypy.overrides]]
 module = "tests.*"

scripts/use_setuptools.py

@@ -13,7 +13,7 @@ def use_setuptools() -> None:
     pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
     data = tomllib.loads(pyproject_path.read_bytes().decode())
     data["build-system"] = {
-        "requires": ["setuptools>=69", "mypy[mypyc]>=1.13"],
+        "requires": ["setuptools>=69", "mypy[mypyc]>=1.15"],
         "build-backend": "setuptools.build_meta",
     }
     pyproject_path.write_bytes(tomli_w.dumps(data).encode())

setup.py

@@ -5,7 +5,7 @@
 if os.environ.get("TOMLI_USE_MYPYC") == "1":
     import glob
 
-    from mypyc.build import mypycify  # type: ignore[import-untyped]
+    from mypyc.build import mypycify
 
     files = glob.glob("src/**/*.py", recursive=True)
     ext_modules = mypycify(files)

src/tomli/_parser.py

@@ -226,7 +226,7 @@ class Flags:
     EXPLICIT_NEST: Final = 1
 
     def __init__(self) -> None:
-        self._flags: dict[str, dict] = {}
+        self._flags: dict[str, dict[Any, Any]] = {}
         self._pending_flags: set[tuple[Key, int]] = set()
 
     def add_pending(self, key: Key, flag: int) -> None:
@@ -284,7 +284,7 @@ def get_or_create_nest(
         key: Key,
         *,
         access_lists: bool = True,
-    ) -> dict:
+    ) -> dict[str, Any]:
         cont: Any = self.dict
         for k in key:
             if k not in cont:
@@ -294,7 +294,7 @@ def get_or_create_nest(
                 cont = cont[-1]
             if not isinstance(cont, dict):
                 raise KeyError("There is no nest behind this key")
-        return cont
+        return cont  # type: ignore[no-any-return]
 
     def append_nest_to_list(self, key: Key) -> None:
         cont = self.get_or_create_nest(key[:-1])
@@ -500,9 +500,9 @@ def parse_one_line_basic_str(src: str, pos: Pos) -> tuple[Pos, str]:
 
 def parse_array(
     src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
-) -> tuple[Pos, list]:
+) -> tuple[Pos, list[Any]]:
     pos += 1
-    array: list = []
+    array: list[Any] = []
 
     pos = skip_comments_and_array_ws(src, pos)
     if src.startswith("]", pos):
@@ -526,7 +526,7 @@ def parse_array(
 
 def parse_inline_table(
     src: str, pos: Pos, parse_float: ParseFloat, nest_lvl: int
-) -> tuple[Pos, dict]:
+) -> tuple[Pos, dict[str, Any]]:
     pos += 1
     nested_dict = NestedDict()
     flags = Flags()

src/tomli/_re.py

@@ -54,7 +54,7 @@
 )
 
 
-def match_to_datetime(match: re.Match) -> datetime | date:
+def match_to_datetime(match: re.Match[str]) -> datetime | date:
     """Convert a `RE_DATETIME` match to `datetime.datetime` or `datetime.date`.
 
     Raises ValueError if the match does not correspond to a valid date
@@ -103,13 +103,13 @@ def cached_tz(hour_str: str, minute_str: str, sign_str: str) -> timezone:
     )
 
 
-def match_to_localtime(match: re.Match) -> time:
+def match_to_localtime(match: re.Match[str]) -> time:
     hour_str, minute_str, sec_str, micros_str = match.groups()
     micros = int(micros_str.ljust(6, "0")) if micros_str else 0
     return time(int(hour_str), int(minute_str), int(sec_str), micros)
 
 
-def match_to_number(match: re.Match, parse_float: ParseFloat) -> Any:
+def match_to_number(match: re.Match[str], parse_float: ParseFloat) -> Any:
     if match.group("floatpart"):
         return parse_float(match.group())
     return int(match.group(), 0)

tests/burntsushi.py

@@ -44,9 +44,9 @@ def convert(obj):  # noqa: C901
             "value": str(obj),
         }
     elif isinstance(obj, list):
-        return [convert(i) for i in obj]
+        return [convert(i) for i in obj]  # type: ignore[no-untyped-call]
     elif isinstance(obj, dict):
-        return {k: convert(v) for k, v in obj.items()}
+        return {k: convert(v) for k, v in obj.items()}  # type: ignore[no-untyped-call]
     raise Exception("unsupported type")
 
 

tests/test_data.py

@@ -59,6 +59,6 @@ def test_valid(self):
                     continue
                 toml_str = valid.read_bytes().decode()
                 actual = tomllib.loads(toml_str)
-                actual = burntsushi.convert(actual)
+                actual = burntsushi.convert(actual)  # type: ignore[no-untyped-call]
                 expected = burntsushi.normalize(expected)
                 self.assertEqual(actual, expected)

tests/test_error.py

@@ -2,6 +2,9 @@
 # SPDX-FileCopyrightText: 2021 Taneli Hukkinen
 # Licensed to PSF under a Contributor Agreement.
 
+from __future__ import annotations
+
+from typing import Any
 import unittest
 
 from . import tomllib
@@ -57,10 +60,10 @@ def test_type_error(self):
         )
 
     def test_invalid_parse_float(self):
-        def dict_returner(s: str) -> dict:
+        def dict_returner(s: str) -> dict[Any, Any]:
             return {}
 
-        def list_returner(s: str) -> list:
+        def list_returner(s: str) -> list[Any]:
             return []
 
         for invalid_parse_float in (dict_returner, list_returner):