Merge branch 'main' into zmq_anyio

Author: davidbrochart

.github/workflows/ci.yml

@@ -214,22 +214,3 @@ jobs:
       - uses: actions/checkout@v4
       - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
       - uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
-
-  tests_check: # This job does nothing and is only used for the branch protection
-    if: always()
-    needs:
-      - coverage
-      - test_docs
-      - test_without_debugpy
-      - test_miniumum_versions
-      - test_lint
-      - test_prereleases
-      - check_release
-      - link_check
-      - test_sdist
-    runs-on: ubuntu-latest
-    steps:
-      - name: Decide whether the needed jobs succeeded or failed
-        uses: re-actors/alls-green@release/v1
-        with:
-          jobs: ${{ toJSON(needs) }}

.github/workflows/downstream.yml

@@ -132,7 +132,7 @@ jobs:
       - name: Install System Packages
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends libegl1-mesa
+          sudo apt-get install -y --no-install-recommends libgl1 libglx-mesa0
       - name: Install spyder-kernels dependencies
         shell: bash -l {0}
         run: |

.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/datapub.py

@@ -20,7 +20,7 @@
 from jupyter_client.session import Session, extract_header
 
 warnings.warn(
-    "ipykernel.datapub is deprecated. It has moved to ipyparallel.datapub",
+    "ipykernel.datapub is deprecated since ipykernel 4.3.0 (2016). It has moved to ipyparallel.datapub",
     DeprecationWarning,
     stacklevel=2,
 )
@@ -73,7 +73,7 @@ def publish_data(data):
         The data to be published. Think of it as a namespace.
     """
     warnings.warn(
-        "ipykernel.datapub is deprecated. It has moved to ipyparallel.datapub",
+        "ipykernel.datapub is deprecated since ipykernel 4.3.0 (2016). It has moved to ipyparallel.datapub",
         DeprecationWarning,
         stacklevel=2,
     )

ipykernel/embed.py

@@ -48,9 +48,10 @@ def embed_kernel(module=None, local_ns=None, **kwargs):
     if module is None:
         module = caller_module
     if local_ns is None:
-        local_ns = caller_locals
+        local_ns = dict(**caller_locals)
 
     app.kernel.user_module = module
+    assert isinstance(local_ns, dict)
     app.kernel.user_ns = local_ns
     app.shell.set_completer_frame()  # type:ignore[union-attr]
     app.start()

ipykernel/inprocess/blocking.py

@@ -69,6 +69,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

@@ -11,6 +11,9 @@
 # Imports
 # -----------------------------------------------------------------------------
 
+
+from typing import Any
+
 from jupyter_client.client import KernelClient
 from jupyter_client.clientabc import KernelClientABC
 
@@ -54,9 +57,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
 
@@ -99,9 +102,18 @@ def hb_channel(self):
     # Methods for sending specific messages
     # -------------------------------------
 
-    async def execute(
-        self, code, silent=False, store_history=True, user_expressions=None, allow_stdin=None
-    ):
+    # Feb 2025: superclass in jupyter-Client is sync,
+    # it should likely be made all consistent and push
+    # jupyter_client async as well
+    async def execute(  # type:ignore [override]
+        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
@@ -114,7 +126,9 @@ async def execute(
         )
         msg = self.session.msg("execute_request", content)
         await self._dispatch_to_kernel(msg)
-        return msg["header"]["msg_id"]
+        res = msg["header"]["msg_id"]
+        assert isinstance(res, str)
+        return res
 
     async def complete(self, code, cursor_pos=None):
         """Get code completion."""

ipykernel/inprocess/session.py

@@ -1,8 +1,17 @@
+from typing import Any
+
 from jupyter_client.session import Session as _Session
 
 
 class Session(_Session):
-    async def recv(self, socket, copy=True):
+    # superclass is not async.
+    async def recv(  # type: ignore[override]
+        self, socket, mode: int = 0, content: bool = True, copy=True
+    ) -> Any:
+        """
+        mode, content, copy have no effect, but are present for superclass compatibility
+
+        """
         return await socket.arecv_multipart().wait()
 
     def send(

ipykernel/ipkernel.py

@@ -18,7 +18,18 @@
 from IPython.core import release
 from IPython.utils.tokenutil import line_at_cursor, token_at_cursor
 from jupyter_client.session import extract_header
-from traitlets import Any, Bool, HasTraits, Instance, List, Type, default, observe, observe_compat
+from traitlets import (
+    Any,
+    Bool,
+    Dict,
+    HasTraits,
+    Instance,
+    List,
+    Type,
+    default,
+    observe,
+    observe_compat,
+)
 
 from .comm.comm import BaseComm
 from .comm.manager import CommManager
@@ -92,7 +103,7 @@ def _user_module_changed(self, change):
         if self.shell is not None:
             self.shell.user_module = change["new"]
 
-    user_ns = Instance("collections.abc.Mapping", allow_none=True)
+    user_ns = Dict(allow_none=True)
 
     @default("user_ns")
     def _default_user_ns(self):

ipykernel/kernelapp.py

@@ -339,12 +339,12 @@ def init_sockets(self):
         self.shell_socket = zmq_anyio.Socket(context.socket(zmq.ROUTER))
         self.shell_socket.linger = 1000
         self.shell_port = self._bind_socket(self.shell_socket, self.shell_port)
-        self.log.debug("shell ROUTER Channel on port: %i" % self.shell_port)
+        self.log.debug("shell ROUTER Channel on port: %i", self.shell_port)
 
         self.stdin_socket = context.socket(zmq.ROUTER)
         self.stdin_socket.linger = 1000
         self.stdin_port = self._bind_socket(self.stdin_socket, self.stdin_port)
-        self.log.debug("stdin ROUTER Channel on port: %i" % self.stdin_port)
+        self.log.debug("stdin ROUTER Channel on port: %i", self.stdin_port)
 
         if hasattr(zmq, "ROUTER_HANDOVER"):
             # set router-handover to workaround zeromq reconnect problems
@@ -360,7 +360,7 @@ def init_control(self, context):
         self.control_socket = zmq_anyio.Socket(context.socket(zmq.ROUTER))
         self.control_socket.linger = 1000
         self.control_port = self._bind_socket(self.control_socket, self.control_port)
-        self.log.debug("control ROUTER Channel on port: %i" % self.control_port)
+        self.log.debug("control ROUTER Channel on port: %i", self.control_port)
 
         self.debugpy_socket = zmq_anyio.Socket(context.socket(zmq.STREAM))
         self.debugpy_socket.linger = 1000
@@ -385,7 +385,7 @@ def init_iopub(self, context):
         self.iopub_socket = zmq_anyio.Socket(context.socket(zmq.PUB))
         self.iopub_socket.linger = 1000
         self.iopub_port = self._bind_socket(self.iopub_socket, self.iopub_port)
-        self.log.debug("iopub PUB Channel on port: %i" % self.iopub_port)
+        self.log.debug("iopub PUB Channel on port: %i", self.iopub_port)
         self.configure_tornado_logger()
         self.iopub_thread = IOPubThread(self.iopub_socket, pipe=True)
         self.iopub_thread.start()
@@ -399,7 +399,7 @@ def init_heartbeat(self):
         hb_ctx = zmq.Context()
         self.heartbeat = Heartbeat(hb_ctx, (self.transport, self.ip, self.hb_port))
         self.hb_port = self.heartbeat.port
-        self.log.debug("Heartbeat REP Channel on port: %i" % self.hb_port)
+        self.log.debug("Heartbeat REP Channel on port: %i", self.hb_port)
         self.heartbeat.start()
 
     def close(self):
@@ -515,7 +515,7 @@ def init_io(self):
                         isinstance(handler, StreamHandler)
                         and (buffer := getattr(handler.stream, "buffer", None))
                         and (fileno := getattr(buffer, "fileno", None))
-                        and fileno() == sys.stderr._original_stdstream_fd  # type:ignore[attr-defined]
+                        and fileno() == sys.stderr._original_stdstream_fd
                     ):
                         self.log.debug("Seeing logger to stderr, rerouting to raw filedescriptor.")
                         io_wrapper = TextIOWrapper(
@@ -697,7 +697,7 @@ def init_pdb(self):
             pdb.set_trace = debugger.set_trace
 
     @catch_config_error
-    def initialize(self, argv=None):
+    def initialize(self, argv=None) -> None:
         """Initialize the application."""
         super().initialize(argv)
         if self.subapp is not None:
@@ -735,22 +735,18 @@ def initialize(self, argv=None):
         sys.stdout.flush()
         sys.stderr.flush()
 
-    def start(self) -> None:
-        """Start the application."""
+    async def _start(self, backend: str) -> None:
+        """
+        Async version of start, when the loop is not controlled by IPykernel
+
+        For example to be used in test suite with @pytest.mark.trio
+        """
         if self.subapp is not None:
             self.subapp.start()
             return
         if self.poller is not None:
             self.poller.start()
-        backend = "trio" if self.trio_loop else "asyncio"
-        run(partial(self.main, backend), backend=backend)
-        return
-
-    async def _wait_to_enter_eventloop(self):
-        await self.kernel._eventloop_set.wait()
-        await self.kernel.enter_eventloop()
 
-    async def main(self, backend: str):
         if backend == "asyncio" and sys.platform == "win32":
             import asyncio
 
@@ -760,16 +756,27 @@ async def main(self, backend: str):
 
                 selector = get_selector()
                 selector._thread.pydev_do_not_trace = True
-                # selector._thread.is_pydev_daemon_thread = True
 
+        await self.main()
+
+    def start(self) -> None:
+        """Start the application."""
+        backend = "trio" if self.trio_loop else "asyncio"
+        run(partial(self._start, backend), backend=backend)
+
+    async def _wait_to_enter_eventloop(self) -> None:
+        await self.kernel._eventloop_set.wait()
+        await self.kernel.enter_eventloop()
+
+    async def main(self) -> None:
         async with create_task_group() as tg:
             tg.start_soon(self._wait_to_enter_eventloop)
             tg.start_soon(self.kernel.start)
 
         if self.kernel.eventloop:
             self.kernel._eventloop_set.set()
 
-    def stop(self):
+    def stop(self) -> None:
         """Stop the kernel, thread-safe."""
         self.kernel.stop()