Merge pull request #769 from blink1073/more-mypy

Author: blink1073

.github/workflows/main.yml

@@ -68,9 +68,6 @@ jobs:
           pip install -e .[test]
           pip freeze
 
-      - name: Check types
-        run: mypy jupyter_client --exclude '\/tests|kernelspecapp|ioloop|runapp' --install-types --non-interactive
-
       - name: Run the tests
         if: ${{ !startsWith(matrix.python-version, 'pypy') && !startsWith(matrix.os, 'windows') }}
         run: |

.pre-commit-config.yaml

@@ -50,6 +50,15 @@ repos:
           ]
         stages: [manual]
 
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.942
+    hooks:
+      - id: mypy
+        exclude: jupyter_client/tests
+        args: ["--config-file", "pyproject.toml"]
+        additional_dependencies: [pyzmq, tornado, types-paramiko]
+        stages: [manual]
+
   - repo: https://github.com/PyCQA/doc8
     rev: 0.11.1
     hooks:

docs/conf.py

@@ -63,7 +63,7 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-version_ns = {}
+version_ns: dict = {}
 here = os.path.dirname(__file__)
 version_py = os.path.join(here, os.pardir, 'jupyter_client', '_version.py')
 with open(version_py) as f:
@@ -219,7 +219,7 @@
 
 # -- Options for LaTeX output ---------------------------------------------
 
-latex_elements = {
+latex_elements: dict = {
     # The paper size ('letterpaper' or 'a4paper').
     # 'papersize': 'letterpaper',
     # The font size ('10pt', '11pt' or '12pt').
@@ -312,7 +312,7 @@
 on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
 
 if not on_rtd:  # only import and set the theme if we're building docs locally
-    import sphinx_rtd_theme
+    import sphinx_rtd_theme  # type:ignore[import]
 
     html_theme = 'sphinx_rtd_theme'
     html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

jupyter_client/adapter.py

@@ -84,7 +84,7 @@ def handle_reply_status_error(self, msg: Dict[str, Any]) -> Dict[str, Any]:
         """
         return msg
 
-    def __call__(self, msg: Dict[str, Any]):
+    def __call__(self, msg: Dict[str, Any]) -> Dict[str, Any]:
         msg = self.update_header(msg)
         msg = self.update_metadata(msg)
         msg = self.update_msg_type(msg)

jupyter_client/asynchronous/client.py

@@ -1,7 +1,7 @@
 """Implements an async kernel client"""
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
-from traitlets import Type  # type: ignore
+from traitlets import Type
 
 from jupyter_client.channels import HBChannel
 from jupyter_client.channels import ZMQSocketChannel

jupyter_client/blocking/client.py

@@ -4,7 +4,7 @@
 """
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
-from traitlets import Type  # type: ignore
+from traitlets import Type
 
 from ..utils import run_sync
 from jupyter_client.channels import HBChannel

jupyter_client/channels.py

@@ -49,7 +49,7 @@ class HBChannel(Thread):
 
     def __init__(
         self,
-        context: zmq.asyncio.Context = None,
+        context: t.Optional[zmq.asyncio.Context] = None,
         session: t.Optional[Session] = None,
         address: t.Union[t.Tuple[str, int], str] = "",
     ):
@@ -210,7 +210,7 @@ def __init__(
         self.socket: t.Optional[zmq.sugar.socket.Socket] = socket
         self.session = session
 
-    async def _recv(self, **kwargs) -> t.Dict[str, t.Any]:
+    async def _recv(self, **kwargs: t.Any) -> t.Dict[str, t.Any]:
         assert self.socket is not None
         msg = await self.socket.recv_multipart(**kwargs)
         ident, smsg = self.session.feed_identities(msg)

jupyter_client/client.py

@@ -10,7 +10,7 @@
 from queue import Empty
 
 import zmq.asyncio
-from traitlets import Any  # type: ignore
+from traitlets import Any
 from traitlets import Bool
 from traitlets import Instance
 from traitlets import Type
@@ -120,19 +120,19 @@ def _context_default(self) -> zmq.asyncio.Context:
     # Channel proxy methods
     # --------------------------------------------------------------------------
 
-    async def _async_get_shell_msg(self, *args, **kwargs) -> t.Dict[str, t.Any]:
+    async def _async_get_shell_msg(self, *args: Any, **kwargs: Any) -> t.Dict[str, t.Any]:
         """Get a message from the shell channel"""
         return await self.shell_channel.get_msg(*args, **kwargs)
 
-    async def _async_get_iopub_msg(self, *args, **kwargs) -> t.Dict[str, t.Any]:
+    async def _async_get_iopub_msg(self, *args: Any, **kwargs: Any) -> t.Dict[str, t.Any]:
         """Get a message from the iopub channel"""
         return await self.iopub_channel.get_msg(*args, **kwargs)
 
-    async def _async_get_stdin_msg(self, *args, **kwargs) -> t.Dict[str, t.Any]:
+    async def _async_get_stdin_msg(self, *args: Any, **kwargs: Any) -> t.Dict[str, t.Any]:
         """Get a message from the stdin channel"""
         return await self.stdin_channel.get_msg(*args, **kwargs)
 
-    async def _async_get_control_msg(self, *args, **kwargs) -> t.Dict[str, t.Any]:
+    async def _async_get_control_msg(self, *args: Any, **kwargs: Any) -> t.Dict[str, t.Any]:
         """Get a message from the control channel"""
         return await self.control_channel.get_msg(*args, **kwargs)
 
@@ -253,7 +253,7 @@ def _output_hook_kernel(
         self,
         session: Session,
         socket: zmq.sugar.socket.Socket,
-        parent_header,
+        parent_header: Any,
         msg: t.Dict[str, t.Any],
     ) -> None:
         """Output hook when running inside an IPython kernel
@@ -676,7 +676,7 @@ def history(
         raw: bool = True,
         output: bool = False,
         hist_access_type: str = "range",
-        **kwargs,
+        **kwargs: Any,
     ) -> str:
         """Get entries from the kernel's history list.
 

jupyter_client/connect.py

@@ -23,19 +23,19 @@
 from typing import Tuple
 from typing import Union
 
-import zmq  # type: ignore
-from jupyter_core.paths import jupyter_data_dir  # type: ignore
+import zmq
+from jupyter_core.paths import jupyter_data_dir
 from jupyter_core.paths import jupyter_runtime_dir
 from jupyter_core.paths import secure_write
-from traitlets import Bool  # type: ignore
+from traitlets import Bool
 from traitlets import CaselessStrEnum
 from traitlets import Instance
 from traitlets import Int
 from traitlets import Integer
 from traitlets import observe
 from traitlets import Type
 from traitlets import Unicode
-from traitlets.config import LoggingConfigurable  # type: ignore
+from traitlets.config import LoggingConfigurable
 from traitlets.config import SingletonConfigurable
 
 from .localinterfaces import localhost
@@ -644,7 +644,7 @@ class is attempting to resolve (minimize).
     See: https://github.com/jupyter/jupyter_client/issues/487
     """
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.currently_used_ports: Set[int] = set()
 

jupyter_client/consoleapp.py

@@ -14,15 +14,15 @@
 import warnings
 from typing import cast
 
-from jupyter_core.application import base_aliases  # type: ignore
+from jupyter_core.application import base_aliases
 from jupyter_core.application import base_flags
-from traitlets import CBool  # type: ignore
+from traitlets import CBool
 from traitlets import CUnicode
 from traitlets import Dict
 from traitlets import List
 from traitlets import Type
 from traitlets import Unicode
-from traitlets.config.application import boolean_flag  # type: ignore
+from traitlets.config.application import boolean_flag
 
 from . import connect
 from . import find_connection_file
@@ -155,7 +155,7 @@ def _connection_file_default(self) -> str:
         to force a direct exit without any confirmation.""",
     )
 
-    def build_kernel_argv(self, argv=None) -> None:
+    def build_kernel_argv(self, argv: object = None) -> None:
         """build argv to be passed to kernel subprocess
 
         Override in subclasses if any args should be passed to the kernel
@@ -354,7 +354,7 @@ def init_kernel_client(self) -> None:
 
         self.kernel_client.start_channels()
 
-    def initialize(self, argv=None) -> None:
+    def initialize(self, argv: object = None) -> None:
         """
         Classes which mix this class in should call:
                JupyterConsoleApp.initialize(self,argv)