From 86788b8e6d6a8dbb3c3af74d2f2fdd6143087316 Mon Sep 17 00:00:00 2001 From: Allison Karlitskaya Date: Tue, 30 Apr 2024 07:33:27 +0200 Subject: [PATCH] cockpit-ci: Update container to 2024-04-25 This brings in a buggy definition in the version of the typeshed included in the new container image. Add an #ignore. See https://github.com/python/typeshed/pull/11548 Closes #20372 --- .cockpit-ci/container | 2 +- src/cockpit/transports.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.cockpit-ci/container b/.cockpit-ci/container index 218f87f52eb4..cfb1254caf80 100644 --- a/.cockpit-ci/container +++ b/.cockpit-ci/container @@ -1 +1 @@ -ghcr.io/cockpit-project/tasks:2024-04-08 +ghcr.io/cockpit-project/tasks:2024-04-25 diff --git a/src/cockpit/transports.py b/src/cockpit/transports.py index 8aabc7d83d6b..969819f60e09 100644 --- a/src/cockpit/transports.py +++ b/src/cockpit/transports.py @@ -402,7 +402,8 @@ def preexec_fn() -> None: super().__init__(loop, protocol, in_fd, out_fd) - self._get_watcher(loop).add_child_handler(self._process.pid, self._exited) + # https://github.com/python/typeshed/pull/11548 + self._get_watcher(loop).add_child_handler(self._process.pid, self._exited) # type: ignore[arg-type] def set_window_size(self, size: WindowSize) -> None: assert self._pty_fd is not None