Use ruff as a code formatter (#500)

* Use ruff as a code formatter

* Improve wording

.github/workflows/lint.yml

@@ -34,6 +34,6 @@ jobs:
       run: |
         ruff python_scripts
 
-    - name: Check with Black Code Formatter
+    - name: Check the formatting with ruff
       run: |
-        black python_scripts --check
+        ruff format --check python_scripts

.pre-commit-config.yaml

@@ -1,18 +1,10 @@
 repos:
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.3
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.4
     hooks:
       - id: ruff
-        args:
-          - --fix
         files: ^((python_scripts)/.+)?[^/]+\.py$
-  - repo: https://github.com/psf/black
-    rev: 23.10.1
-    hooks:
-      - id: black
-        args:
-          - --safe
-          - --quiet
+      - id: ruff-format
         files: ^((python_scripts)/.+)?[^/]+\.py$
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0

python_scripts/shellies_discovery.py

@@ -1532,7 +1532,8 @@ def mqtt_publish(topic, payload, retain, json=False):
     roller_mode = True
 
 ignored = [
-    element.lower() for element in data.get(CONF_IGNORED_DEVICES, [])  # noqa: F821
+    element.lower()
+    for element in data.get(CONF_IGNORED_DEVICES, [])  # noqa: F821
 ]
 mac = data.get(CONF_MAC)  # noqa: F821
 
@@ -2838,9 +2839,7 @@ def mqtt_publish(topic, payload, retain, json=False):
     for sensor, sensor_options in relay_binary_sensors.items():
         config_topic = f"{disc_prefix}/binary_sensor/{dev_id}-{make_id(sensor)}-{relay_id}/config".encode(
             "ascii", "ignore"
-        ).decode(
-            "utf-8"
-        )
+        ).decode("utf-8")
         if device_config.get(f"relay-{relay_id}-name"):
             sensor_name = f"{device_config[f'relay-{relay_id}-name']} {format_entity_name(sensor)}"
         else:
@@ -2982,9 +2981,7 @@ def mqtt_publish(topic, payload, retain, json=False):
 for input_id in range(inputs):
     config_topic = f"{disc_prefix}/device_automation/{dev_id}-input-{input_id}/button_release/config".encode(
         "ascii", "ignore"
-    ).decode(
-        "utf-8"
-    )
+    ).decode("utf-8")
     topic = f"shellies/{dev_id}/input/{input_id}"
     payload = {
         KEY_AUTOMATION_TYPE: VALUE_TRIGGER,
@@ -3004,9 +3001,7 @@ def mqtt_publish(topic, payload, retain, json=False):
     for event in inputs_types:
         config_topic = f"{disc_prefix}/device_automation/{dev_id}-input-{input_id}/{event}/config".encode(
             "ascii", "ignore"
-        ).decode(
-            "utf-8"
-        )
+        ).decode("utf-8")
         payload = {
             KEY_AUTOMATION_TYPE: VALUE_TRIGGER,
             KEY_TOPIC: topic,
@@ -3239,9 +3234,7 @@ def mqtt_publish(topic, payload, retain, json=False):
     for sensor, sensor_options in light_binary_sensors.items():
         config_topic = f"{disc_prefix}/binary_sensor/{dev_id}-color-{sensor}-{light_id}/config".encode(
             "ascii", "ignore"
-        ).decode(
-            "utf-8"
-        )
+        ).decode("utf-8")
         if mode == LIGHT_COLOR:
             payload = {
                 KEY_NAME: f"{format_entity_name(sensor)} {light_id}",
@@ -3370,9 +3363,7 @@ def mqtt_publish(topic, payload, retain, json=False):
     for sensor, sensor_options in light_binary_sensors.items():
         config_topic = f"{disc_prefix}/binary_sensor/{dev_id}-white-{sensor}-{light_id}/config".encode(
             "ascii", "ignore"
-        ).decode(
-            "utf-8"
-        )
+        ).decode("utf-8")
         if mode != LIGHT_COLOR:
             payload = {
                 KEY_NAME: f"{format_entity_name(sensor)} {light_id}",

requirements-test.txt

@@ -1,2 +1 @@
-black==23.10.1
-ruff==0.1.3
+ruff==0.1.4

ruff.toml

@@ -53,6 +53,7 @@ ignore = [
     "FBT002",   # Boolean default value in function definition
     "FBT003",   # Boolean positional value in function call
     "INP001",   # Add an `__init__.py`
+    "ISC001",   # Single line implicit string concatenation
     "TRY003",   # Avoid specifying long messages outside the exception class
 ]