Update types for mypy 1.7 (#892)

.pre-commit-config.yaml

@@ -51,7 +51,7 @@ repos:
         args: ["-L", "sur,nd"]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.6.1"
+    rev: "v1.7.0"
     hooks:
       - id: mypy
         files: "^traitlets"

pyproject.toml

@@ -33,7 +33,7 @@ Tracker = "https://github.com/ipython/traitlets/issues"
 [project.optional-dependencies]
 test = [
     "argcomplete>=3.0.3",
-    "mypy>=1.6.0",
+    "mypy>=1.7.0",
     "pre-commit",
     "pytest-mock",
     "pytest-mypy-testing",

tests/test_typing.py

@@ -102,9 +102,9 @@ class T(HasTraits):
     t = T()
     reveal_type(List(["foo"]))  # R: traitlets.traitlets.List[builtins.str]
     reveal_type(List([""]).tag(sync=True))  # R: traitlets.traitlets.List[builtins.str]
-    reveal_type(List(None, allow_none=True))  # R: traitlets.traitlets.List[<nothing>]
+    reveal_type(List(None, allow_none=True))  # R: traitlets.traitlets.List[Never]
     reveal_type(
-        List(None, allow_none=True).tag(sync=True)  # R: traitlets.traitlets.List[<nothing>]
+        List(None, allow_none=True).tag(sync=True)  # R: traitlets.traitlets.List[Never]
     )
     reveal_type(T.latex_command)  # R: traitlets.traitlets.List[builtins.str]
     reveal_type(t.latex_command)  # R: builtins.list[builtins.str]

traitlets/config/application.py

@@ -96,7 +96,7 @@
 IS_PYTHONW = sys.executable and sys.executable.endswith("pythonw.exe")
 
 T = t.TypeVar("T", bound=t.Callable[..., t.Any])
-AnyLogger = t.Union[logging.Logger, logging.LoggerAdapter]
+AnyLogger = t.Union[logging.Logger, "logging.LoggerAdapter[t.Any]"]
 StrDict = t.Dict[str, t.Any]
 ArgvType = t.Optional[t.List[str]]
 ClassesType = t.List[t.Type[Configurable]]
@@ -713,12 +713,12 @@ def initialize_subcommand(self, subc: str, argv: ArgvType = None) -> None:
             self.subapp = subapp.instance(parent=self)
         elif callable(subapp):
             # or ask factory to create it...
-            self.subapp = subapp(self)  # type:ignore[call-arg]
+            self.subapp = subapp(self)
         else:
             raise AssertionError("Invalid mappings for subcommand '%s'!" % subc)
 
         # ... and finally initialize subapp.
-        self.subapp.initialize(argv)  # type:ignore[union-attr]
+        self.subapp.initialize(argv)
 
     def flatten_flags(self) -> tuple[dict[str, t.Any], dict[str, t.Any]]:
         """Flatten flags and aliases for loaders, so cl-args override as expected.

traitlets/config/argcomplete_config.py

@@ -45,7 +45,7 @@ def get_argcomplete_cwords() -> t.Optional[t.List[str]]:
             cword_suffix,
             comp_words,
             last_wordbreak_pos,
-        ) = argcomplete.split_line(comp_line, comp_point)  # type:ignore[attr-defined]
+        ) = argcomplete.split_line(comp_line, comp_point)  # type:ignore[attr-defined,no-untyped-call]
     except ModuleNotFoundError:
         return None
 
@@ -73,7 +73,7 @@ def increment_argcomplete_index() -> None:
         os.environ["_ARGCOMPLETE"] = str(int(os.environ["_ARGCOMPLETE"]) + 1)
     except Exception:
         try:
-            argcomplete.debug("Unable to increment $_ARGCOMPLETE", os.environ["_ARGCOMPLETE"])  # type:ignore[attr-defined]
+            argcomplete.debug("Unable to increment $_ARGCOMPLETE", os.environ["_ARGCOMPLETE"])  # type:ignore[attr-defined,no-untyped-call]
         except (KeyError, ModuleNotFoundError):
             pass
 
@@ -196,7 +196,7 @@ def _get_completions(
         # Instead, check if comp_words only consists of the script,
         # if so check if any subcommands start with cword_prefix.
         if self.subcommands and len(comp_words) == 1:
-            argcomplete.debug("Adding subcommands for", cword_prefix)  # type:ignore[attr-defined]
+            argcomplete.debug("Adding subcommands for", cword_prefix)  # type:ignore[attr-defined,no-untyped-call]
             completions.extend(subc for subc in self.subcommands if subc.startswith(cword_prefix))
 
         return completions