Replace black with ruff format and align the ruff config

.pre-commit-config.yaml

@@ -1,11 +1,7 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 23.1.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.16.9
     hooks:
-      - id: black
-        args: ["--safe", "--quiet"]
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: 'v0.0.246'
-    hooks:
-      - id: ruff
-        args: ["--fix"]
+      - id: ruff-check
+        args: ["--fix", "--exit-non-zero-on-fix"]
+      - id: ruff-format

pyproject.toml

@@ -54,18 +54,27 @@ enabled = true
 [project.scripts]
 zigpy = "zigpy_cli.__main__:cli"
 
-
 [tool.ruff]
+target-version = "py311"
+line-length = 88
+src = ["zigpy_cli", "tests"]
+
+[tool.ruff.lint]
 select = [
-    # Pyflakes
-    "F",
-    # Pycodestyle
-    "E",
-    "W",
-    # isort
-    "I001"
+    "B", # flake8-bugbear
+    "C", # complexity
+    "E", # pycodestyle
+    "F", # pyflakes/autoflake
+    "I", # isort
+    "SIM", # flake8-simplify
+    "UP", # pyupgrade
+    "W", # pycodestyle
 ]
-src = ["zigpy_cli", "tests"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.mccabe]
+max-complexity = 25
+
+[tool.ruff.lint.isort]
+force-sort-within-sections = true
 known-first-party = ["zigpy_cli", "tests"]
+combine-as-imports = true

zigpy_cli/__main__.py

@@ -1,5 +1,5 @@
+from zigpy_cli.cli import cli  # noqa: F401
 import zigpy_cli.database  # noqa: F401
 import zigpy_cli.ota  # noqa: F401
 import zigpy_cli.pcap  # noqa: F401
 import zigpy_cli.radio  # noqa: F401
-from zigpy_cli.cli import cli  # noqa: F401

zigpy_cli/cli.py

@@ -58,12 +58,7 @@ def cli(verbose):
     ROOT_LOGGER.setLevel(log_level)
 
     coloredlogs.install(
-        fmt=(
-            "%(asctime)s.%(msecs)03d"
-            " %(hostname)s"
-            " %(name)s"
-            " %(levelname)s %(message)s"
-        ),
+        fmt="%(asctime)s.%(msecs)03d %(hostname)s %(name)s %(levelname)s %(message)s",
         level=log_level,
         level_styles=level_styles,
         logger=ROOT_LOGGER,

zigpy_cli/database.py

@@ -121,7 +121,7 @@ def recover(input_path, output_path):
             pragma_user_version,
         )
 
-    if zigpy.appdb.DB_VERSION != max_table_version:
+    if max_table_version != zigpy.appdb.DB_VERSION:
         LOGGER.warning(
             "Zigpy's current DB version is %s but the maximum table version is %s!",
             zigpy.appdb.DB_VERSION,

zigpy_cli/ota.py

@@ -8,9 +8,9 @@
 import subprocess
 
 import click
-import zigpy.types as t
 from zigpy.ota.image import ElementTagId, HueSBLOTAImage, parse_ota_image
 from zigpy.ota.validators import validate_ota_image
+import zigpy.types as t
 from zigpy.types.named import _hex_string_to_bytes
 from zigpy.util import convert_install_code as zigpy_convert_install_code
 

zigpy_cli/pcap.py

@@ -6,10 +6,10 @@
 import sys
 
 import click
-import zigpy.types as t
 from scapy.config import conf as scapy_conf
 from scapy.layers.dot15d4 import Dot15d4  # NOQA: F401
 from scapy.utils import PcapReader, PcapWriter
+import zigpy.types as t
 
 from zigpy_cli.cli import cli
 

zigpy_cli/radio.py

@@ -11,9 +11,9 @@
 import sys
 
 import click
+from zigpy.application import ControllerApplication
 import zigpy.backups
 import zigpy.types
-from zigpy.application import ControllerApplication
 
 from zigpy_cli.cli import cli, click_coroutine
 from zigpy_cli.common import CHANNELS_LIST
@@ -123,10 +123,7 @@ async def backup(
             "i_understand_i_can_update_eui64_only_once_and_i_still_want_to_do_it"
         ] = True
 
-    if zigpy_format:
-        obj = backup.as_dict()
-    else:
-        obj = backup.as_open_coordinator_json()
+    obj = backup.as_dict() if zigpy_format else backup.as_open_coordinator_json()
 
     output.write(json.dumps(obj, indent=4) + "\n")