replace black with ruff format

Author: CM000n

.github/scripts/update_manifest.py

@@ -16,7 +16,7 @@ def update_manifest():
 
     version_striped = version.replace("v", "")
 
-    print(f"Version number being inserted: {str(version_striped)}")
+    print(f"Version number being inserted: {version_striped!s}")
 
     print("Opening file...")
 
@@ -30,9 +30,7 @@ def update_manifest():
 
     print("Saving file...")
 
-    with open(
-        f"{os.getcwd()}/custom_components/qss/manifest.json", "w"
-    ) as manifestfile:
+    with open(f"{os.getcwd()}/custom_components/qss/manifest.json", "w") as manifestfile:
         manifestfile.write(json.dumps(manifest, indent=4, sort_keys=True))
 
     print("Done!")

.pre-commit-config.yaml

@@ -17,14 +17,19 @@ repos:
         args: [--mapping, '2', --sequence, '4', --offset, '2', --width, '120', --implicit_start]
   - repo: local
     hooks:
-      - id: black
-        name: black
-        entry: poetry run black
+      - id: codespell
+        name: codespell
+        entry: poetry run codespell --write-changes --skip="./*"
+        language: system
+        pass_filenames: false
+        always_run: true
+      - id: ruff format
+        name: ruff format
+        entry: poetry run ruff format
         language: system
         types: [python]
-        require_serial: true
-      - id: ruff
-        name: ruff
+      - id: ruff lint
+        name: ruff lint
         entry: poetry run ruff
         language: system
         types: [python]

custom_components/qss/__init__.py

@@ -79,9 +79,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     auth_y_key = conf.get(CONF_AUTH).get(CONF_AUTH_Y_KEY)
     db_auth = (auth_kid, auth_d_key, auth_x_key, auth_y_key)
 
-    instance = QuestDB(
-        hass=hass, host=db_host, port=db_port, entity_filter=entity_filter, auth=db_auth
-    )
+    instance = QuestDB(hass=hass, host=db_host, port=db_port, entity_filter=entity_filter, auth=db_auth)
     instance.async_initialize()
     instance.start()
 
@@ -91,7 +89,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 class QuestDB(threading.Thread):  # pylint: disable = R0902
     """A threaded qss class."""
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         hass: HomeAssistant,
         host: str,
@@ -118,7 +116,6 @@ def async_initialize(self):
 
     def run(self):
         """Run qss and insert data."""
-
         shutdown_task = object()
         hass_started = concurrent.futures.Future()
 
@@ -127,7 +124,7 @@ def register():
             """Register qss to Home Assistant."""
             self.qss_ready.set_result(True)
 
-            def shutdown(event: Event):  # pylint: disable = W0613
+            def shutdown(event: Event):  # noqa: ARG001
                 """Shut down the qss."""
                 if not hass_started.done():
                     hass_started.set_result(shutdown_task)
@@ -141,13 +138,11 @@ def shutdown(event: Event):  # pylint: disable = W0613
             else:
 
                 @callback
-                def notify_hass_started(event: Event):  # pylint: disable = W0613
+                def notify_hass_started(event: Event):  # noqa: ARG001
                     """Notify that hass has started."""
                     hass_started.set_result(None)
 
-                self.hass.bus.async_listen_once(
-                    EVENT_HOMEASSISTANT_START, notify_hass_started
-                )
+                self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, notify_hass_started)
 
         self.hass.add_job(register)
         result = hass_started.result()
@@ -158,9 +153,7 @@ def notify_hass_started(event: Event):  # pylint: disable = W0613
         while True:
             event = get_event_from_queue(self.queue)
             finish_task_if_empty_event(event, self.queue)
-            insert_event_data_into_questdb(
-                self.host, self.port, self.auth, event, self.queue
-            )
+            insert_event_data_into_questdb(self.host, self.port, self.auth, event, self.queue)
 
     @callback
     def event_listener(self, event: Event):

custom_components/qss/event_handling.py

@@ -6,18 +6,11 @@
 from homeassistant.core import Event
 
 
-def put_event_to_queue(
-    event: Event, entity_filter: Callable[[str], bool], queue: Queue
-) -> None:
+def put_event_to_queue(event: Event, entity_filter: Callable[[str], bool], queue: Queue) -> None:
     """Get events with new states and put them in the process queue."""
     entity_id = event.data.get(ATTR_ENTITY_ID)
     state = event.data.get("new_state")
-    if all([
-        entity_id,
-        state,
-        state.state != STATE_UNKNOWN,
-        entity_filter(entity_id)
-    ]):
+    if all([entity_id, state, state.state != STATE_UNKNOWN, entity_filter(entity_id)]):
         queue.put(event)
 
 

custom_components/qss/io.py

@@ -69,9 +69,7 @@ def _retry_data_insertion(host: str, port: int, auth: tuple, event: Event) -> No
     _insert_row(host, port, auth, event)
 
 
-def insert_event_data_into_questdb(
-    host: str, port: int, auth: tuple, event: Event, queue: Queue
-) -> None:
-    """Inserting given event data into QuestDB."""
+def insert_event_data_into_questdb(host: str, port: int, auth: tuple, event: Event, queue: Queue) -> None:
+    """Insert given event data into QuestDB."""
     _retry_data_insertion(host, port, auth, event)
     queue.task_done()

poetry.lock

@@ -16,7 +16,7 @@ tenacity = "^8.0.0"
 [tool.poetry.dev-dependencies]
 homeassistant = "^2023.6"
 pre-commit = "^2.21.0"
-black = "^22.12.0"
+codespell = "^2.0.0"
 ruff = "^0.1.6"
 
 
@@ -27,15 +27,31 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.ruff]
 select = [
+    # Ruff specific
+    "RUF",
+    # Pylint
+    "PL",
     # Pyflakes
     "F",
+    # pep8-naming
+    "N",
     # Pycodestyle
     "E",
     "W",
+    "D",
+    # flake8-2020
     "YTT",
+    # flake8-async
+    "ASYNC",
+    # flake8-bugbear
+    "B",
+    # flake8-unused-arguments
+    "ARG",
+    # flake8-commas
+    "COM",
     # Isort
-    "I001",
-    "I002"
+    "I"
 ]
-line-length = 88
-fix = false
+extend-ignore = ["PLR2004", "D203", "D213", "COM812"]
+line-length = 120
+fix = true