Bump mypy (#1333)

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

Author: 2 people

.pre-commit-config.yaml

@@ -40,18 +40,18 @@ repos:
         types_or: [yaml, html, json]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.8.0"
+    rev: "v1.15.0"
     hooks:
       - id: mypy
         files: ipykernel
-        stages: [manual]
         args: ["--install-types", "--non-interactive"]
         additional_dependencies:
           [
             "traitlets>=5.13",
             "ipython>=8.16.1",
             "jupyter_client>=8.5",
             "appnope",
+            "types-psutil",
           ]
 
   - repo: https://github.com/adamchainz/blacken-docs

ipykernel/heartbeat.py

@@ -103,7 +103,7 @@ def run(self):
 
         while True:
             try:
-                zmq.device(zmq.QUEUE, self.socket, self.socket)
+                zmq.device(zmq.QUEUE, self.socket, self.socket)  # type:ignore[attr-defined]
             except zmq.ZMQError as e:
                 if e.errno == errno.EINTR:
                     # signal interrupt, resume heartbeat

ipykernel/inprocess/blocking.py

@@ -68,6 +68,7 @@ def call_handlers(self, msg):
             _raw_input = self.client.kernel._sys_raw_input
             prompt = msg["content"]["prompt"]
             print(prompt, end="", file=sys.__stdout__)
+            assert sys.__stdout__ is not None
             sys.__stdout__.flush()
             self.client.input(_raw_input())
 

ipykernel/inprocess/client.py

@@ -12,6 +12,7 @@
 # -----------------------------------------------------------------------------
 
 import asyncio
+from typing import Any
 
 from jupyter_client.client import KernelClient
 from jupyter_client.clientabc import KernelClientABC
@@ -57,9 +58,9 @@ def _default_blocking_class(self):
 
         return BlockingInProcessKernelClient
 
-    def get_connection_info(self):
+    def get_connection_info(self, session: bool = False):
         """Get the connection info for the client."""
-        d = super().get_connection_info()
+        d = super().get_connection_info(session=session)
         d["kernel"] = self.kernel  # type:ignore[assignment]
         return d
 
@@ -103,8 +104,14 @@ def hb_channel(self):
     # -------------------------------------
 
     def execute(
-        self, code, silent=False, store_history=True, user_expressions=None, allow_stdin=None
-    ):
+        self,
+        code: str,
+        silent: bool = False,
+        store_history: bool = True,
+        user_expressions: dict[str, Any] | None = None,
+        allow_stdin: bool | None = None,
+        stop_on_error: bool = True,
+    ) -> str:
         """Execute code on the client."""
         if allow_stdin is None:
             allow_stdin = self.allow_stdin
@@ -117,7 +124,9 @@ def execute(
         )
         msg = self.session.msg("execute_request", content)
         self._dispatch_to_kernel(msg)
-        return msg["header"]["msg_id"]
+        res = msg["header"]["msg_id"]
+        assert isinstance(res, str)
+        return res
 
     def complete(self, code, cursor_pos=None):
         """Get code completion."""

ipykernel/kernelapp.py

@@ -488,7 +488,12 @@ def init_io(self):
             sys.stderr = outstream_factory(self.session, self.iopub_thread, "stderr", echo=e_stderr)
             if hasattr(sys.stderr, "_original_stdstream_copy"):
                 for handler in self.log.handlers:
-                    if isinstance(handler, StreamHandler) and (handler.stream.buffer.fileno() == 2):
+                    if (
+                        isinstance(handler, StreamHandler)
+                        and (buffer := getattr(handler.stream, "buffer", None))
+                        and (fileno := getattr(buffer, "fileno", None))
+                        and fileno() == sys.stderr._original_stdstream_fd
+                    ):
                         self.log.debug("Seeing logger to stderr, rerouting to raw filedescriptor.")
 
                         handler.stream = TextIOWrapper(
@@ -549,9 +554,9 @@ def init_signal(self):
     def init_kernel(self):
         """Create the Kernel object itself"""
         shell_stream = ZMQStream(self.shell_socket)
-        control_stream = ZMQStream(self.control_socket, self.control_thread.io_loop)
-        debugpy_stream = ZMQStream(self.debugpy_socket, self.control_thread.io_loop)
-        self.control_thread.start()
+        control_stream = ZMQStream(self.control_socket, self.control_thread.io_loop)  # type:ignore[union-attr]
+        debugpy_stream = ZMQStream(self.debugpy_socket, self.control_thread.io_loop)  # type:ignore[union-attr]
+        self.control_thread.start()  # type:ignore[union-attr]
         kernel_factory = self.kernel_class.instance  # type:ignore[attr-defined]
 
         kernel = kernel_factory(

ipykernel/kernelbase.py

@@ -580,7 +580,7 @@ def start(self):
 
         control_loop = self.control_thread.io_loop if self.control_thread else self.io_loop
 
-        asyncio.run_coroutine_threadsafe(self.poll_control_queue(), control_loop.asyncio_loop)
+        asyncio.run_coroutine_threadsafe(self.poll_control_queue(), control_loop.asyncio_loop)  # type:ignore[union-attr]
         if self.shell_stream:
             self.shell_stream.on_recv(
                 partial(

ipykernel/zmqshell.py

@@ -78,12 +78,16 @@ def _hooks(self):
             self._thread_local.hooks = []
         return self._thread_local.hooks
 
-    def publish(
+    # Feb: 2025 IPython has a deprecated, `source` parameter, marked for removal that
+    # triggers typing errors.
+    def publish(  # type: ignore [override]
         self,
         data,
         metadata=None,
+        *,
         transient=None,
         update=False,
+        **kwargs,
     ):
         """Publish a display-data message
 
@@ -483,7 +487,7 @@ def _update_exit_now(self, change):
 
     # Over ZeroMQ, GUI control isn't done with PyOS_InputHook as there is no
     # interactive input being read; we provide event loop support in ipkernel
-    def enable_gui(self, gui):
+    def enable_gui(self, gui=None):
         """Enable a given guil."""
         from .eventloops import enable_gui as real_enable_gui
 
@@ -595,14 +599,10 @@ def set_parent(self, parent):
         self.display_pub.set_parent(parent)  # type:ignore[attr-defined]
         if hasattr(self, "_data_pub"):
             self.data_pub.set_parent(parent)
-        try:
-            sys.stdout.set_parent(parent)  # type:ignore[attr-defined]
-        except AttributeError:
-            pass
-        try:
-            sys.stderr.set_parent(parent)  # type:ignore[attr-defined]
-        except AttributeError:
-            pass
+        if hasattr(sys.stdout, "set_parent"):
+            sys.stdout.set_parent(parent)
+        if hasattr(sys.stderr, "set_parent"):
+            sys.stderr.set_parent(parent)
 
     def get_parent(self):
         """Get the parent header."""