Improve typing by ignoring less

jupyter · Dec 24, 2023 · 44ccd8b · 44ccd8b
1 parent 4ce8c1a
commit 44ccd8b
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 33 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -21,23 +21,23 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.27.2
+    rev: "0.27.2"
     hooks:
       - id: check-github-workflows
 
   - repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.17
+    rev: "0.7.17"
     hooks:
       - id: mdformat
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.3"
+    rev: v3.0.3
     hooks:
       - id: prettier
         types_or: [yaml, html, json]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.7.1"
+    rev: v1.7.1
     hooks:
       - id: mypy
         files: jupyter_client
@@ -53,13 +53,13 @@ repos:
         additional_dependencies: [black==23.7.0]
 
   - repo: https://github.com/codespell-project/codespell
-    rev: "v2.2.6"
+    rev: v2.2.6
     hooks:
       - id: codespell
         args: ["-L", "sur,nd"]
 
   - repo: https://github.com/pre-commit/pygrep-hooks
-    rev: "v1.10.0"
+    rev: v1.10.0
     hooks:
       - id: rst-backticks
       - id: rst-directive-colons

diff --git a/jupyter_client/connect.py b/jupyter_client/connect.py
@@ -547,7 +547,7 @@ def load_connection_info(self, info: KernelConnectionInfo) -> None:
             See the connection_file spec for details.
         """
         self.transport = info.get("transport", self.transport)
-        self.ip = info.get("ip", self._ip_default())  # type:ignore[assignment]
+        self.ip = info.get("ip", self._ip_default())
 
         self._record_random_port_names()
         for name in port_names:

diff --git a/jupyter_client/manager.py b/jupyter_client/manager.py
@@ -733,20 +733,20 @@ def client(  # type:ignore[override]
         """Get a client for the manager."""
         return super().client(**kwargs)  # type:ignore[return-value]
 
-    _launch_kernel = KernelManager._async_launch_kernel  # type:ignore[assignment]
-    start_kernel: t.Callable[..., t.Awaitable] = KernelManager._async_start_kernel  # type:ignore[assignment]
-    pre_start_kernel: t.Callable[..., t.Awaitable] = KernelManager._async_pre_start_kernel  # type:ignore[assignment]
-    post_start_kernel: t.Callable[..., t.Awaitable] = KernelManager._async_post_start_kernel  # type:ignore[assignment]
-    request_shutdown: t.Callable[..., t.Awaitable] = KernelManager._async_request_shutdown  # type:ignore[assignment]
-    finish_shutdown: t.Callable[..., t.Awaitable] = KernelManager._async_finish_shutdown  # type:ignore[assignment]
-    cleanup_resources: t.Callable[..., t.Awaitable] = KernelManager._async_cleanup_resources  # type:ignore[assignment]
-    shutdown_kernel: t.Callable[..., t.Awaitable] = KernelManager._async_shutdown_kernel  # type:ignore[assignment]
-    restart_kernel: t.Callable[..., t.Awaitable] = KernelManager._async_restart_kernel  # type:ignore[assignment]
-    _send_kernel_sigterm = KernelManager._async_send_kernel_sigterm  # type:ignore[assignment]
-    _kill_kernel = KernelManager._async_kill_kernel  # type:ignore[assignment]
-    interrupt_kernel: t.Callable[..., t.Awaitable] = KernelManager._async_interrupt_kernel  # type:ignore[assignment]
-    signal_kernel: t.Callable[..., t.Awaitable] = KernelManager._async_signal_kernel  # type:ignore[assignment]
-    is_alive: t.Callable[..., t.Awaitable] = KernelManager._async_is_alive  # type:ignore[assignment]
+    _launch_kernel = KernelManager._async_launch_kernel
+    start_kernel = KernelManager._async_start_kernel
+    pre_start_kernel = KernelManager._async_pre_start_kernel
+    post_start_kernel = KernelManager._async_post_start_kernel
+    request_shutdown = KernelManager._async_request_shutdown
+    finish_shutdown = KernelManager._async_finish_shutdown
+    cleanup_resources = KernelManager._async_cleanup_resources
+    shutdown_kernel = KernelManager._async_shutdown_kernel
+    restart_kernel = KernelManager._async_restart_kernel
+    _send_kernel_sigterm = KernelManager._async_send_kernel_sigterm
+    _kill_kernel = KernelManager._async_kill_kernel
+    interrupt_kernel = KernelManager._async_interrupt_kernel
+    signal_kernel = KernelManager._async_signal_kernel
+    is_alive = KernelManager._async_is_alive
 
 
 KernelManagerABC.register(KernelManager)

diff --git a/jupyter_client/multikernelmanager.py b/jupyter_client/multikernelmanager.py
@@ -226,7 +226,7 @@ def update_env(self, *, kernel_id: str, env: t.Dict[str, str]) -> None:
             self._kernels[kernel_id].update_env(env=env)
 
     async def _add_kernel_when_ready(
-        self, kernel_id: str, km: KernelManager, kernel_awaitable: t.Awaitable
+        self, kernel_id: str, km: KernelManager, kernel_awaitable: t.Awaitable[t.Any]
     ) -> None:
         try:
             await kernel_awaitable
@@ -236,7 +236,7 @@ async def _add_kernel_when_ready(
             self.log.exception(e)
 
     async def _remove_kernel_when_ready(
-        self, kernel_id: str, kernel_awaitable: t.Awaitable
+        self, kernel_id: str, kernel_awaitable: t.Awaitable[t.Any]
     ) -> None:
         try:
             await kernel_awaitable
@@ -618,7 +618,7 @@ def _context_default(self) -> zmq.asyncio.Context:
         self._created_context = True
         return zmq.asyncio.Context()
 
-    start_kernel: t.Callable[..., t.Awaitable] = MultiKernelManager._async_start_kernel  # type:ignore[assignment]
-    restart_kernel: t.Callable[..., t.Awaitable] = MultiKernelManager._async_restart_kernel  # type:ignore[assignment]
-    shutdown_kernel: t.Callable[..., t.Awaitable] = MultiKernelManager._async_shutdown_kernel  # type:ignore[assignment]
-    shutdown_all: t.Callable[..., t.Awaitable] = MultiKernelManager._async_shutdown_all  # type:ignore[assignment]
+    start_kernel = MultiKernelManager._async_start_kernel
+    restart_kernel = MultiKernelManager._async_restart_kernel
+    shutdown_kernel = MultiKernelManager._async_shutdown_kernel
+    shutdown_all = MultiKernelManager._async_shutdown_all
diff --git a/jupyter_client/runapp.py b/jupyter_client/runapp.py
@@ -44,8 +44,8 @@ class RunApp(JupyterApp, JupyterConsoleApp):  # type:ignore[misc]
     version = __version__
     name = "jupyter run"
     description = """Run Jupyter kernel code."""
-    flags = Dict(flags)  # type:ignore[assignment]
-    aliases = Dict(aliases)  # type:ignore[assignment]
+    flags = Dict(flags)
+    aliases = Dict(aliases)
     frontend_aliases = Any(frontend_aliases)
     frontend_flags = Any(frontend_flags)
     kernel_timeout = Float(

diff --git a/jupyter_client/ssh/tunnel.py b/jupyter_client/ssh/tunnel.py
@@ -25,9 +25,9 @@
 
         SSHException = paramiko.ssh_exception.SSHException
 except ImportError:
-    paramiko = None  # type:ignore[assignment]
+    paramiko = None
 
-    class SSHException(Exception):  # type:ignore[no-redef]  # noqa
+    class SSHException(Exception):  # noqa: N818
         pass
 
 else:

diff --git a/tests/problemkernel.py b/tests/problemkernel.py
@@ -18,7 +18,7 @@ class ProblemTestKernel(Kernel):
 
 
 class ProblemTestApp(IPKernelApp):
-    kernel_class = ProblemTestKernel  # type:ignore[assignment]
+    kernel_class = ProblemTestKernel
 
     def init_io(self):
         # Overridden to disable stdout/stderr capture

diff --git a/tests/signalkernel.py b/tests/signalkernel.py
@@ -62,7 +62,7 @@ def do_execute(
 
 
 class SignalTestApp(IPKernelApp):
-    kernel_class = SignalTestKernel  # type:ignore[assignment]
+    kernel_class = SignalTestKernel
 
     def init_io(self):
         # Overridden to disable stdout/stderr capture