Fix linting and types

.envrc

@@ -1,3 +1 @@
-source_url "https://raw.githubusercontent.com/cachix/devenv/5811f4817ba24da923506d134fff2610b8f95ff2/direnvrc" "sha256-IN2rc7pbaBxxjcdIpYOe9lkpiyjSr2V2AwF6KwlnWYQ="
-
-use devenv
+use flake

.github/workflows/push.yml

@@ -17,11 +17,10 @@ jobs:
       max-parallel: 5
       matrix:
         python-version:
-          - 3.7
-          - 3.8
           - 3.9
           - "3.10"
           - 3.11
+          - 3.12
 
     steps:
     - uses: actions/checkout@v1

.github/workflows/tag.yml

@@ -13,11 +13,10 @@ jobs:
       max-parallel: 5
       matrix:
         python-version:
-          - 3.7
-          - 3.8
           - 3.9
-          - "3.10"
+          - 3.10
           - 3.11
+          - 3.12
 
     steps:
     - uses: actions/checkout@v1
@@ -58,4 +57,4 @@ jobs:
       - name: Publish distribution to PyPI
         uses: pypa/gh-action-pypi-publish@master
         with:
-          password: ${{ secrets.pypi_password }}
+          password: ${{ secrets.pypi_password }}

flake.nix

@@ -0,0 +1,21 @@
+{
+  inputs = {
+    utils.url = "github:numtide/flake-utils";
+  };
+  outputs = { self, nixpkgs, utils }: utils.lib.eachDefaultSystem (system:
+    let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in
+    {
+      devShell = pkgs.mkShell {
+        buildInputs = with pkgs; [
+          python3Packages.tox
+          python39
+          python310
+          python311
+          python312
+        ];
+      };
+    }
+  );
+}

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 (
@@ -240,9 +237,7 @@ def handle_response_packet(self, packet: PacketType) -> None:
         self._last_ack = packet
         self._command_ack.set()
 
-    async def send_command_ack(
-        self, device_id: str, action: str
-    ) -> Generator[Any, None, Optional[bool]]:
+    async def send_command_ack(self, device_id: str, action: str) -> "bool | None":
         """Send command, wait for gateway to repond with acknowledgment."""
         # serialize commands
         await self._ready_to_send.acquire()
@@ -396,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."""
     ...
 
@@ -413,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."""
     ...
 
@@ -429,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()
@@ -444,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