Fix types en linting

Author: aequitas

pyproject.toml

@@ -1,2 +1,6 @@
 [tool.black]
 target-version = ["py34", "py35", "py36", "py37", "py38"]
+
+[tool.pyright]
+venvPath = "."
+venv = ".tox/py311"

rflink/__main__.py

@@ -23,9 +23,9 @@
 import asyncio
 import logging
 import sys
+from importlib.metadata import version
 from typing import Dict, Optional, Sequence, Type  # noqa: unused-import
 
-import pkg_resources
 from docopt import docopt
 
 from .protocol import (  # noqa: unused-import
@@ -54,9 +54,7 @@ def main(
     argv: Sequence[str] = sys.argv[1:], loop: Optional[asyncio.AbstractEventLoop] = None
 ) -> None:
     """Parse argument and setup main program loop."""
-    args = docopt(
-        __doc__, argv=argv, version=pkg_resources.require("rflink")[0].version
-    )
+    args = docopt(__doc__, argv=argv, version=version("rflink"))
 
     level = logging.ERROR
     if args["-v"]:

rflink/protocol.py

@@ -6,25 +6,22 @@
 import asyncio
 import concurrent
 import logging
+import socket
 from datetime import timedelta
 from fnmatch import fnmatchcase
 from functools import partial
 from typing import (
     TYPE_CHECKING,
     Any,
     Callable,
-    Generator,
     Optional,
     Sequence,
-    Tuple,
     Type,
     Union,
     cast,
     overload,
 )
 
-import socket
-
 from serial_asyncio_fast import create_serial_connection
 
 from .parser import (
@@ -394,7 +391,7 @@ def create_rflink_connection(
     disconnect_callback: Optional[Callable[[Optional[Exception]], None]] = None,
     ignore: Optional[Sequence[str]] = None,
     loop: Optional[asyncio.AbstractEventLoop] = None,
-) -> "Coroutine[Any, Any, Tuple[asyncio.BaseTransport, ProtocolBase]]":
+) -> "Coroutine[Any, Any, tuple[asyncio.Transport, asyncio.Protocol]]":
     """Create Rflink manager class, returns transport coroutine."""
     ...
 
@@ -411,7 +408,7 @@ def create_rflink_connection(
     disconnect_callback: Optional[Callable[[Optional[Exception]], None]] = None,
     ignore: Optional[Sequence[str]] = None,
     loop: Optional[asyncio.AbstractEventLoop] = None,
-) -> "Coroutine[Any, Any, Tuple[asyncio.BaseTransport, ProtocolBase]]":
+) -> "Coroutine[Any, Any, tuple[asyncio.Transport, asyncio.Protocol]]":
     """Create Rflink manager class, returns transport coroutine."""
     ...
 
@@ -427,7 +424,7 @@ def create_rflink_connection(
     disconnect_callback: Optional[Callable[[Optional[Exception]], None]] = None,
     ignore: Optional[Sequence[str]] = None,
     loop: Optional[asyncio.AbstractEventLoop] = None,
-) -> "Coroutine[Any, Any, Tuple[asyncio.BaseTransport, ProtocolBase]]":
+) -> "Coroutine[Any, Any, tuple[asyncio.Transport, asyncio.Protocol]]":
     """Create Rflink manager class, returns transport coroutine."""
     if loop is None:
         loop = asyncio.get_event_loop()
@@ -442,10 +439,12 @@ def create_rflink_connection(
         keepalive=keepalive,
     )
 
+    conn: Coroutine[Any, Any, tuple[asyncio.Transport, asyncio.Protocol]]
+
     # setup serial connection if no transport specified
     if host:
         conn = loop.create_connection(protocol_factory, host, cast(int, port))
     else:
-        conn = create_serial_connection(loop, protocol_factory, port, baud)
+        conn = create_serial_connection(loop, protocol_factory, str(port), baud)
 
-    return conn  # type: ignore
+    return conn

rflinkproxy/__main__.py

@@ -21,9 +21,9 @@
 import logging
 import sys
 from functools import partial
+from importlib.metadata import version
 from typing import Any, Callable, Dict, cast
 
-import pkg_resources
 from docopt import docopt
 from serial_asyncio_fast import create_serial_connection
 
@@ -279,9 +279,7 @@ async def connect(self):
 
 def main(argv=sys.argv[1:], loop=None):
     """Parse argument and setup main program loop."""
-    args = docopt(
-        __doc__, argv=argv, version=pkg_resources.require("rflink")[0].version
-    )
+    args = docopt(__doc__, argv=argv, version=version("rflink"))
 
     level = logging.ERROR
     if args["-v"]:

tox.ini

@@ -24,7 +24,7 @@ usedevelop = True
 [testenv:fix]
 commands =
 	autopep8 --aggressive --in-place --recursive .
-	isort -rc .
+	isort .
 	black .
 deps =
   isort
@@ -43,8 +43,11 @@ deps =
   pyflakes<2.5
 
 [testenv:typing]
-commands = mypy --strict --ignore-missing-imports rflink
-deps = mypy
+commands = mypy --install-types --non-interactive --strict --follow-untyped-imports --ignore-missing-imports rflink
+#commands = basedpyright rflink
+deps =
+  types-docopt
+  mypy
 
 [testenv:pypy3]
 deps =