Merge pull request #58 from natekspencer/dev

Switch to ruff
garbled1 · Apr 4, 2024 · c5c6db6 · c5c6db6
2 parents 29c93c1 + 52ae0c3
commit c5c6db6
Show file tree

Hide file tree

Showing 16 changed files with 220 additions and 652 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,4 +8,4 @@ updates:
   - package-ecosystem: "pip" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: "monthly"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,26 +15,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install poetry
         run: pipx install poetry
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           cache: "poetry"
       - name: Install dependencies
         run: poetry install
       - name: Run linting
         run: |
-          poetry run isort .
-          poetry run black . --check
-          poetry run flake8 .
-          poetry run pylint pybalboa tests
-          poetry run pydocstyle pybalboa tests
+          poetry run ruff check .
+          poetry run ruff format . --check
       - name: Run mypy
         run: poetry run mypy pybalboa tests
       - name: Test with pytest

diff --git a/poetry.lock b/poetry.lock
diff --git a/pybalboa/__init__.py b/pybalboa/__init__.py
@@ -1,4 +1,5 @@
 """Balboa spa module."""
+
 __version__ = "1.0.1"
 
 

diff --git a/pybalboa/__main__.py b/pybalboa/__main__.py
@@ -1,4 +1,5 @@
 """Main entry."""
+
 import asyncio
 import logging
 import sys
@@ -128,7 +129,7 @@ async def test_controls(spa: SpaClient) -> None:
             if option not in (state, control.state):
                 await adjust_control(control, option)
         if control.state != state:
-            await adjust_control(control, state)
+            await adjust_control(control, state)  # type: ignore
         print()
 
 
@@ -161,7 +162,7 @@ async def adjust_control(control: SpaControl, state: IntEnum) -> None:
 
     async def _state_check() -> None:
         while control.state != state:
-            await asyncio.sleep(0.1)
+            await asyncio.sleep(0.1)  # type: ignore
 
     wait = 10
     try:

diff --git a/pybalboa/client.py b/pybalboa/client.py
@@ -1,4 +1,5 @@
 """Balboa spa client."""
+
 from __future__ import annotations
 
 import asyncio

diff --git a/pybalboa/control.py b/pybalboa/control.py
@@ -1,4 +1,5 @@
 """Balboa spa control."""
+
 from __future__ import annotations
 
 import logging
@@ -187,7 +188,7 @@ async def set_state(self, state: int | HeatMode) -> bool:
             return False
         if self._state == state:
             return True
-        i = 2 if self.state == HeatMode.READY_IN_REST and state == HeatMode.READY else 1
+        i = 2 if self.state == HeatMode.READY_IN_REST and state == HeatMode.READY else 1  # type: ignore
         for _ in range(i):
             await self._client.send_message(MessageType.TOGGLE_STATE, self._code)
         return True

diff --git a/pybalboa/enums.py b/pybalboa/enums.py
@@ -1,4 +1,5 @@
 """Enums module."""
+
 from __future__ import annotations
 
 from enum import Enum, IntEnum

diff --git a/pybalboa/utils.py b/pybalboa/utils.py
@@ -1,4 +1,5 @@
 """Utilities module."""
+
 from __future__ import annotations
 
 import asyncio

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,20 +11,16 @@ keywords = ["Balboa", "spa", "hot tub", "asynchronous"]
 include = ["pybalboa/py.typed"]
 
 [tool.poetry.dependencies]
-python = "^3.7.2"
+python = "^3.8.1"
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 pytest = "^7.2.2"
 pytest-asyncio = "^0.20.3"
 pytest-cov = "^4.0.0"
 pytest-timeout = "^2.1.0"
-black = "^23.1.0"
-isort = "^5.11.5"
-mypy = "^1.1"
-flake8 = "^5.0.4"
-pylint = "^2.17.0"
+mypy = "^1.3"
 tox = "^3.26.0"
-pydocstyle = "^6.3.0"
+ruff = "^0.3"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,4 +1,5 @@
 """Conftest."""
+
 from __future__ import annotations
 
 import asyncio

diff --git a/tests/test_client.py b/tests/test_client.py
@@ -1,4 +1,5 @@
 """Tests module."""
+
 from __future__ import annotations
 
 import pytest
@@ -31,34 +32,40 @@ async def test_bfbp20s(bfbp20s: SpaServer) -> None:
 
         control = spa.pumps[0]
         assert control.name == "Pump 1"
+        assert isinstance(control.state, OffLowHighState)
         assert control.state == OffLowHighState.OFF
         assert control.options == list(OffLowHighState)
 
         control = spa.lights[0]
         assert control.name == "Light 1"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.ON
         assert control.options == list(OffOnState)
         await control.set_state(OffOnState.OFF)
         assert bfbp20s.received_messages[-1]
 
         control = spa.lights[1]
         assert control.name == "Light 2"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.OFF
         assert control.options == list(OffOnState)
 
         assert spa.circulation_pump
         control = spa.circulation_pump
         assert control.name == "Circulation pump"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.ON
         assert control.options == list(OffOnState)
 
         control = spa.temperature_range
         assert control.name == "Temperature range"
+        assert isinstance(control.state, LowHighRange)
         assert control.state == LowHighRange.HIGH
         assert control.options == list(LowHighRange)
 
         control = spa.heat_mode
         assert control.name == "Heat mode"
+        assert isinstance(control.state, HeatMode)
         assert control.state == HeatMode.READY
         assert control.options == list(HeatMode)[:2]
 
@@ -77,11 +84,13 @@ async def test_lpi501st(lpi501st: SpaServer) -> None:
 
         control = spa.pumps[0]
         assert control.name == "Pump 1"
+        assert isinstance(control.state, OffLowHighState)
         assert control.state == OffLowHighState.OFF
         assert control.options == list(OffLowHighState)
 
         control = spa.pumps[1]
         assert control.name == "Pump 2"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.OFF
         assert control.options == list(OffOnState)
 
@@ -98,11 +107,13 @@ async def test_mxbp20(mxbp20: SpaServer) -> None:
 
         control = spa.pumps[0]
         assert control.name == "Pump 1"
+        assert isinstance(control.state, OffLowHighState)
         assert control.state == OffLowHighState.OFF
         assert control.options == list(OffLowHighState)
 
         control = spa.pumps[1]
         assert control.name == "Pump 2"
+        assert isinstance(control.state, OffLowHighState)
         assert control.state == OffLowHighState.OFF
         assert control.options == list(OffLowHighState)
 
@@ -128,28 +139,33 @@ async def test_bp501g1(bp501g1: SpaServer) -> None:
 
         control = spa.pumps[0]
         assert control.name == "Pump 1"
+        assert isinstance(control.state, OffLowHighState)
         assert control.state == OffLowHighState.LOW
         assert control.options == list(OffLowHighState)
 
         control = spa.pumps[1]
         assert control.name == "Pump 2"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.ON
         assert control.options == list(OffOnState)
 
         control = spa.lights[0]
         assert control.name == "Light 1"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.OFF
         assert control.options == list(OffOnState)
         await control.set_state(OffOnState.ON)
         assert bp501g1.received_messages[-1]
 
         control = spa.temperature_range
         assert control.name == "Temperature range"
+        assert isinstance(control.state, LowHighRange)
         assert control.state == LowHighRange.HIGH
         assert control.options == list(LowHighRange)
 
         control = spa.heat_mode
         assert control.name == "Heat mode"
+        assert isinstance(control.state, HeatMode)
         assert control.state == HeatMode.READY
         assert control.options == list(HeatMode)[:2]
 
@@ -177,29 +193,34 @@ async def test_bp6013g1(bp6013g1: SpaServer) -> None:
 
         control = spa.pumps[0]
         assert control.name == "Pump 1"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.OFF
         assert control.options == list(OffOnState)
 
         control = spa.lights[0]
         assert control.name == "Light 1"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.ON
         assert control.options == list(OffOnState)
         await control.set_state(OffOnState.OFF)
         assert bp6013g1.received_messages[-1]
 
         control = spa.blowers[0]
         assert control.name == "Blower 1"
+        assert isinstance(control.state, OffOnState)
         assert control.state == OffOnState.OFF
         assert control.options == list(OffOnState)
         await control.set_state(OffOnState.ON)
         assert bp6013g1.received_messages[-1]
 
         control = spa.temperature_range
         assert control.name == "Temperature range"
+        assert isinstance(control.state, LowHighRange)
         assert control.state == LowHighRange.HIGH
         assert control.options == list(LowHighRange)
 
         control = spa.heat_mode
         assert control.name == "Heat mode"
+        assert isinstance(control.state, HeatMode)
         assert control.state == HeatMode.READY
         assert control.options == list(HeatMode)[:2]
diff --git a/tests/test_enums.py b/tests/test_enums.py
@@ -1,4 +1,5 @@
 """Tests module."""
+
 from pybalboa.enums import MessageType, SettingsCode
 
 

diff --git a/tests/test_init.py b/tests/test_init.py
@@ -1,4 +1,5 @@
 """Tests module."""
+
 from pybalboa import __version__
 
 

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -1,4 +1,5 @@
 """Tests module."""
+
 import asyncio
 
 from pybalboa.utils import (

diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 isolated_build = True
-envlist = lint, mypy, py38, py39, py310, py311
+envlist = lint, mypy, py39, py310, py311, py312
 skip_missing_interpreters = True
 
 [tox:.package]
@@ -14,11 +14,8 @@ commands =
 [testenv:lint]
 ignore_errors = True
 commands =
-  poetry run isort .
-  poetry run black . --check
-  poetry run flake8 pybalboa tests
-  poetry run pylint pybalboa tests
-  poetry run pydocstyle pybalboa tests
+  poetry run ruff check .
+  poetry run ruff format . --check
 
 [testenv:mypy]
 ignore_errors = True
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,5 @@
		"""Balboa spa module."""

		__version__ = "1.0.1"


Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,5 @@
		"""Tests module."""

		from pybalboa.enums import MessageType, SettingsCode


Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,5 @@
		"""Tests module."""

		from pybalboa import __version__


Expand Down