Merge pull request #327 from kratz00/ruff

ruff: Simplifying Python linter usage

Author: kratz00

.flake8

@@ -1,2 +1,3 @@
 http://camera.local/latest.jpg
 https://github/*
+https://megalinter.io/configuration/

.lycheeignore

@@ -10,6 +10,9 @@ DISABLE_LINTERS:
   - SPELL_CSPELL
   - MARKDOWN_MARKDOWN_LINK_CHECK
   - REPOSITORY_CHECKOV
+  - PYTHON_BLACK
+  - PYTHON_FLAKE8
+  - PYTHON_ISORT
   - PYTHON_MYPY
   - PYTHON_PYRIGHT
   - MAKEFILE_CHECKMAKE

.mega-linter.yml

@@ -33,10 +33,6 @@ repos:
           - "--fix"
       # Run the formatter.
       - id: ruff-format
-  - repo: https://github.com/pycqa/flake8
-    rev: 7.1.2
-    hooks:
-      - id: flake8
   - repo: https://github.com/thlorenz/doctoc
     rev: v2.2.0
     hooks:

.pre-commit-config.yaml

@@ -0,0 +1,76 @@
+# Exclude a variety of commonly ignored directories.
+exclude = [
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".git-rewrite",
+    ".hg",
+    ".ipynb_checkpoints",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pyenv",
+    ".pytest_cache",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    ".vscode",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "site-packages",
+    "venv",
+]
+
+# Same as Black.
+line-length = 132
+indent-width = 4
+
+# Assume Python 3.10
+target-version = "py310"
+
+[lint]
+# See https://docs.astral.sh/ruff/rules/
+select = [
+    # flake8-bugbear
+    "B",
+    # pycodestyle Error
+    "E",
+    # Pyflakes
+    "F",
+    # isort
+    "I",
+    # flake8-simplify
+    "SIM",
+    # pyupgrade
+    "UP",
+    # pycodestyle Warning
+    "W"
+]
+ignore = ["UP007"]
+
+# Allow fix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[format]
+# Like Black, use double quotes for strings.
+quote-style = "double"
+
+# Like Black, indent with spaces, rather than tabs.
+indent-style = "space"
+
+# Like Black, respect magic trailing commas.
+skip-magic-trailing-comma = false
+
+# Like Black, automatically detect the appropriate line ending.
+line-ending = "auto"

.ruff.toml

@@ -15,8 +15,9 @@
 import json
 import logging
 import ssl
+from collections.abc import Callable
 from importlib import metadata
-from typing import Any, Callable, Generic, Optional, TypeVar, Union
+from typing import Any, Generic, Optional, TypeVar, Union
 
 import paho.mqtt.client as mqtt
 from paho.mqtt.client import MQTTMessageInfo

ha_mqtt_discoverable/__init__.py

@@ -20,13 +20,14 @@
 import logging
 from typing import Any, Optional
 
+from pydantic import Field
+
 from ha_mqtt_discoverable import (
     DeviceInfo,
     Discoverable,
     EntityInfo,
     Subscriber,
 )
-from pydantic import Field
 
 logger = logging.getLogger(__name__)
 
@@ -315,10 +316,7 @@ def update_state(self, state: bool) -> None:
         Args:
             state(bool): What state to set the sensor to
         """
-        if state:
-            state_message = self._entity.payload_on
-        else:
-            state_message = self._entity.payload_off
+        state_message = self._entity.payload_on if state else self._entity.payload_off
         logger.info(f"Setting {self._entity.name} to {state_message} using {self.state_topic}")
         self._state_helper(state=state_message)
 

ha_mqtt_discoverable/sensors.py

@@ -17,6 +17,7 @@
 import re
 
 import yaml
+
 from ha_mqtt_discoverable import CONFIGURATION_KEY_NAMES
 
 

ha_mqtt_discoverable/utils.py

@@ -19,79 +19,14 @@ packages = [{include = "ha_mqtt_discoverable"}]
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=7.2.2,<9.0.0"
-flake8 = ">=6,<8"
 pre-commit = "^4.0.1"
-ruff = ">=0.6.8,<0.10.0"
+ruff = "^0.9.10"
 
 
 [tool.poetry.group.test.dependencies]
 pytest-mock = "^3.10.0"
 
 
-[tool.ruff]
-# Exclude a variety of commonly ignored directories.
-exclude = [
-    ".bzr",
-    ".direnv",
-    ".eggs",
-    ".git",
-    ".git-rewrite",
-    ".hg",
-    ".ipynb_checkpoints",
-    ".mypy_cache",
-    ".nox",
-    ".pants.d",
-    ".pyenv",
-    ".pytest_cache",
-    ".pytype",
-    ".ruff_cache",
-    ".svn",
-    ".tox",
-    ".venv",
-    ".vscode",
-    "__pypackages__",
-    "_build",
-    "buck-out",
-    "build",
-    "dist",
-    "node_modules",
-    "site-packages",
-    "venv",
-]
-
-# Same as Black.
-line-length = 132
-indent-width = 4
-
-# Assume Python 3.10
-target-version = "py310"
-
-[tool.ruff.lint]
-# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
-select = ["E4", "E7", "E9", "F"]
-ignore = []
-
-# Allow fix for all enabled rules (when `--fix`) is provided.
-fixable = ["ALL"]
-unfixable = []
-
-# Allow unused variables when underscore-prefixed.
-dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
-
-[tool.ruff.format]
-# Like Black, use double quotes for strings.
-quote-style = "double"
-
-# Like Black, indent with spaces, rather than tabs.
-indent-style = "space"
-
-# Like Black, respect magic trailing commas.
-skip-magic-trailing-comma = false
-
-# Like Black, automatically detect the appropriate line ending.
-line-ending = "auto"
-
-
 [build-system]
 requires = ["poetry-core>=2.0"]
 build-backend = "poetry.core.masonry.api"

poetry.lock

@@ -14,6 +14,7 @@
 #    limitations under the License.
 #
 import pytest
+
 from ha_mqtt_discoverable import Settings
 from ha_mqtt_discoverable.sensors import BinarySensor, BinarySensorInfo
 

pyproject.toml

@@ -14,6 +14,7 @@
 #    limitations under the License.
 #
 import pytest
+
 from ha_mqtt_discoverable import Settings
 from ha_mqtt_discoverable.sensors import Button, ButtonInfo