Merge branch 'main' into zmq_anyio

Author: davidbrochart

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.31.1
+    rev: 0.31.2
     hooks:
       - id: check-github-workflows
 
@@ -74,7 +74,7 @@ repos:
       - id: rst-inline-touching-normal
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.0
+    rev: v0.9.7
     hooks:
       - id: ruff
         types_or: [python, jupyter]
@@ -83,7 +83,7 @@ repos:
         types_or: [python, jupyter]
 
   - repo: https://github.com/scientific-python/cookie
-    rev: "2024.01.24"
+    rev: "2025.01.22"
     hooks:
       - id: sp-repo-review
         additional_dependencies: ["repo-review[cli]"]

ipykernel/_version.py

@@ -1,6 +1,7 @@
 """
 store the current version info of the server.
 """
+
 from __future__ import annotations
 
 import re

ipykernel/inprocess/client.py

@@ -11,7 +11,6 @@
 # Imports
 # -----------------------------------------------------------------------------
 
-
 from typing import Any, Optional
 
 from jupyter_client.client import KernelClient

ipykernel/ipkernel.py

@@ -764,9 +764,9 @@ def run_closure(self: threading.Thread):
             for stream in [stdout, stderr]:
                 if isinstance(stream, OutStream):
                     if parent == kernel_thread_ident:
-                        stream._thread_to_parent_header[
-                            self.ident
-                        ] = kernel._new_threads_parent_header
+                        stream._thread_to_parent_header[self.ident] = (
+                            kernel._new_threads_parent_header
+                        )
                     else:
                         stream._thread_to_parent[self.ident] = parent
             _threading_Thread_run(self)

ipykernel/kernelapp.py

@@ -20,7 +20,7 @@
 
 import zmq
 import zmq_anyio
-from anyio import create_task_group, run
+from anyio import create_task_group, run, to_thread
 from IPython.core.application import (  # type:ignore[attr-defined]
     BaseIPythonApplication,
     base_aliases,
@@ -765,7 +765,7 @@ def start(self) -> None:
         run(partial(self._start, backend), backend=backend)
 
     async def _wait_to_enter_eventloop(self) -> None:
-        await self.kernel._eventloop_set.wait()
+        await to_thread.run_sync(self.kernel._eventloop_set.wait)
         await self.kernel.enter_eventloop()
 
     async def main(self) -> None:

ipykernel/kernelbase.py

@@ -37,7 +37,7 @@
 import psutil
 import zmq
 import zmq_anyio
-from anyio import TASK_STATUS_IGNORED, Event, create_task_group, sleep, to_thread
+from anyio import TASK_STATUS_IGNORED, create_task_group, sleep, to_thread
 from anyio.abc import TaskStatus
 from IPython.core.error import StdinNotImplementedError
 from jupyter_client.session import Session
@@ -236,12 +236,14 @@ def _parent_header(self):
         "list_subshell_request",
     ]
 
-    _eventloop_set: Event = Event()
+    _eventloop_set: threading.Event
 
     def __init__(self, **kwargs):
         """Initialize the kernel."""
         super().__init__(**kwargs)
 
+        self._eventloop_set = threading.Event()
+
         # Kernel application may swap stdout and stderr to OutStream,
         # which is the case in `IPKernelApp.init_io`, hence `sys.stdout`
         # can already by different from TextIO at initialization time.

tests/test_kernelapp.py

@@ -36,14 +36,14 @@ def test_start_app():
     def trigger_stop():
         time.sleep(1)
         app.stop()
-        print("stopped from thread")
 
     thread = threading.Thread(target=trigger_stop)
+    t0 = time.time()
     thread.start()
     app.init_sockets()
-    print("starting")
     app.start()
-    print("stopped")
+    t1 = time.time()
+    assert t1 - t0 >= 1
     app.cleanup_connection_file()
     app.kernel.destroy()
     app.close()