Move to pyproject toml

.github/workflows/python-package.yml

@@ -36,9 +36,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install flake8
-        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
-        if [ -f requirements_test.txt ]; then pip install -r requirements_test.txt; fi
+        pip install . .[test]
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

.github/workflows/python-publish.yml

@@ -21,11 +21,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        pip install build twine
     - name: Build and publish
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         twine upload dist/*

pyproject.toml

@@ -0,0 +1,43 @@
+[build-system]
+requires = ["setuptools>=62.3"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.package-data]
+ynca = ["py.typed"]
+
+[tool.setuptools.packages.find]
+include = ["ynca*"]
+
+
+[project]
+name = "ynca"
+version = "5.16.0"
+description = "Package to control Yamaha receivers that support the YNCA protocol."
+readme = "README.md"
+requires-python = ">=3.8"
+authors = [
+  { name = "Michel van de Wetering", email = "[email protected]" },
+]
+license = {file = "LICENSE.txt"}
+classifiers = [
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: MIT License",
+  "Operating System :: OS Independent",
+  "Development Status :: 5 - Production/Stable",
+  "Intended Audience :: Developers",
+  "Topic :: Home Automation",
+  "Topic :: Software Development :: Libraries",
+]
+dependencies = ["pyserial>=3.4,<4"]
+
+urls = { Homepage = "https://github.com/mvdwetering/ynca" }
+
+[project.optional-dependencies]
+test = [
+  "mypy==1.11.0",
+  "ruff==0.5.5",
+  "pytest>=7.0.0",
+  "pytest-mock",
+  "pytest-cov",
+  "mock-serial==0.0.1",
+]

tests/test_subunit.py

@@ -1,7 +1,7 @@
 """Test Zone subunit"""
 
 from unittest import mock
-import pytest
+import pytest  # type: ignore[import]
 
 from ynca import Avail
 from ynca.constants import Subunit
@@ -155,6 +155,6 @@ class descriptor:
         def __get__(self, instance, owner):
             raise AttributeError("unreadable attribute")
 
-    DummySubunit.__provides__ = descriptor()
+    DummySubunit.__provides__ = descriptor() # type: ignore
     DummySubunit(connection)
 

tests/test_tun.py

@@ -1,4 +1,4 @@
-import pytest
+import pytest # type: ignore[import]
 
 from ynca import BandTun
 from ynca.subunits.tun import Tun
@@ -121,7 +121,7 @@ def test_preset(connection, initialized_tun: Tun):
     assert initialized_tun.preset == 11
 
     connection.send_protocol_message(SUBUNIT, "PRESET", "No Preset")
-    assert initialized_tun.preset == None
+    assert initialized_tun.preset is None
 
     # Set preset
     initialized_tun.preset = 10

ynca/__init__.py

@@ -40,4 +40,42 @@
 )
 from .modelinfo import YncaModelInfo
 
+__all__ = [
+    "YncaApi",
+    "YncaConnectionCheckResult",
+    "YncaConnection",
+    "YncaProtocolStatus",
+    "YncaException",
+    "YncaConnectionError",
+    "YncaConnectionFailed",
+    "YncaInitializationFailedException",
+    "YncaModelInfo",
+    "Avail",
+    "AdaptiveDrc",
+    "BandDab",
+    "BandTun",
+    "DabPreset",
+    "Enhancer",
+    "FmPreset",
+    "HdmiOut",
+    "HdmiOutOnOff",
+    "InitVolLvl",
+    "InitVolMode",
+    "Input",
+    "Mute",
+    "Party",
+    "PartyMute",
+    "Playback",
+    "PlaybackInfo",
+    "PureDirMode",
+    "Pwr",
+    "Repeat",
+    "Shuffle",
+    "Sleep",
+    "SoundPrg",
+    "Straight",
+    "ThreeDeeCinema",
+    "TwoChDecoder",
+]
+
 logging.getLogger(__name__).addHandler(logging.NullHandler())

ynca/api.py

@@ -96,7 +96,7 @@ def _detect_available_subunits(self, connection: YncaConnection):
             2 + (num_commands_sent * (YncaProtocol.COMMAND_SPACING * 5))
         ):
             raise YncaInitializationFailedException(
-                f"Subunit availability check failed"
+                "Subunit availability check failed"
             )
 
         connection.unregister_message_callback(self._protocol_message_received)
@@ -179,7 +179,7 @@ def initialize(self):
         If initialize was successful the client should call the `close()`
         method when done with the Ynca API object to cleanup.
         """
-        assert self._connection == None, "Can only initialize once!"
+        assert self._connection is None, "Can only initialize once!"
 
         is_initialized = False
 

ynca/converters.py

@@ -109,14 +109,14 @@ def to_value(self, value_string: str) -> Any:
         for converter in self._converters:
             try:
                 return converter.to_value(value_string)
-            except:
+            except:  # noqa: E722
                 pass
         raise ValueError(f"No converter could convert '{value_string}' to value")
 
     def to_str(self, value: Any) -> str:
         for converter in self._converters:
             try:
                 return converter.to_str(value)
-            except:
+            except:  # noqa: E722
                 pass
         raise ValueError(f"No converter could convert {value} to string")

ynca/subunit.py

@@ -2,7 +2,7 @@
 
 import logging
 import threading
-from abc import ABC, abstractmethod
+from abc import ABC
 from enum import Flag, auto
 from typing import Any, Callable, Dict, Set
 

ynca/subunits/dab.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
 from ..constants import Subunit
-from ..converters import IntOrNoneConverter
 from ..enums import BandDab, DabPreset, FmPreset
 from ..function import (
     Cmd,
     EnumFunctionMixin,
     EnumOrIntFunctionMixin,
-    IntFunctionMixin,
     StrFunctionMixin,
 )
 from ..subunit import SubunitBase

ynca/terminal.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-import logging
 import re
 import sys