Update pre-commit hoooks and related fixes

.github/scripts/gen_stats.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEST=$(dirname $0)/../../STATS.md
+DEST=$(dirname "$0")/../../STATS.md
 
 TEMPLATE='- ![badge VERSION](https://img.shields.io/github/downloads/mdeweerd/zha-toolkit/VERSION/total.svg)'
 
@@ -12,7 +12,7 @@ EXCLUDES="v0.7.9 v0.7.7 v0.7.6 v0.7.5 v0.7.3 v0.7.2 v0.7.1 v0.7.23 v0.7.24 v0.8.
     echo
     for tag in latest $(git tag -l  --sort=-creatordate v*[0-9]) ; do
         if [[ "$EXCLUDES" != *"$tag"* ]] ; then
-            echo ${TEMPLATE//VERSION/$tag}
+            echo "${TEMPLATE//VERSION/$tag}"
         fi
     done
 ) > "${DEST}"

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: pyupgrade-docs
   - repo: https://github.com/executablebooks/mdformat
     # Do this before other tools "fixing" the line endings
-    rev: 0.7.16
+    rev: 0.7.17
     hooks:
       - id: mdformat
         name: Format Markdown
@@ -26,34 +26,34 @@ repos:
           - mdformat-web
           - mdformat-gfm
   - repo: https://github.com/asottile/blacken-docs
-    rev: 1.13.0
+    rev: 1.16.0
     hooks:
       - id: blacken-docs
         additional_dependencies: [black==22.6.0]
         stages: [manual]   # Manual because already done by mdformat-black
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
+      - id: fix-byte-order-marker
+      - id: mixed-line-ending
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
       - id: no-commit-to-branch
         args: [--branch, main]
       - id: check-yaml
         args: [--unsafe]
       - id: debug-statements
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
       - id: check-json
-      - id: mixed-line-ending
       - id: check-builtin-literals
       - id: check-ast
       - id: check-merge-conflict
       - id: check-executables-have-shebangs
       - id: check-shebang-scripts-are-executable
       - id: check-docstring-first
-      - id: fix-byte-order-marker
       - id: check-case-conflict
       # - id: check-toml
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.29.0
+    rev: v1.32.0
     hooks:
       - id: yamllint
         args:
@@ -69,17 +69,17 @@ repos:
     hooks:
       - id: shellcheck
         files: ^[^\.].*\.sh$
-        # Change the entry to make this work on cygwin
-        args: [-x,-e,SC2086,-e,SC2004,-e,SC2207,-e,SC2002,-e,SC2116]
+        # add "shellcheck disable=SC2086" codes to files, rather than global excludes:
+        # args: [-x,-e,SC2086,-e,SC2004,-e,SC2207,-e,SC2002,-e,SC2116]
         # args: ["--severity=warning"]  # Optionally only show errors and warnings
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.11.0
     hooks:
       - id: pyupgrade
         args:
           - --py39-plus
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.9.1
     hooks:
       - id: black
         args:
@@ -93,7 +93,7 @@ repos:
         args: [--skip, 'B101,B311', --recursive, .]
 
   - repo: https://github.com/fsouza/autoflake8
-    rev: v0.4.0
+    rev: v0.4.1
     hooks:
       - id: autoflake8
         args:
@@ -102,7 +102,7 @@ repos:
           - --expand-star-imports
           - custom_components
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:
@@ -118,7 +118,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.2
+    rev: v2.2.5
     hooks:
       - id: codespell
         args:
@@ -138,7 +138,7 @@ repos:
           #- homeassistant-stubs>=2023.1.7
         # exclude: ^$
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.991
+    rev: v1.5.1
     hooks:
       - id: mypy
         args:

custom_components/zha_toolkit/__init__.py

@@ -23,12 +23,12 @@
 LOGGER = logging.getLogger(__name__)
 
 try:
-    LOADED_VERSION
+    LOADED_VERSION  # type:ignore[used-before-def]
 except NameError:
     LOADED_VERSION = ""
 
 try:
-    DEFAULT_OTAU
+    DEFAULT_OTAU   # type:ignore[used-before-def]
 except NameError:
     DEFAULT_OTAU = "/config/zigpy_ota"
 

custom_components/zha_toolkit/binds.py

@@ -24,7 +24,6 @@
 async def bind_group(
     app, listener, ieee, cmd, data, service, params, event_data
 ):
-
     LOGGER.debug("running 'bind group' command: %s", service)
     if ieee is None:
         LOGGER.error("missing ieee")

custom_components/zha_toolkit/misc.py

@@ -208,7 +208,6 @@ async def rejoin(app, listener, ieee, cmd, data, service, params, event_data):
 async def misc_settime(
     app, listener, ieee, cmd, data, service, params, event_data
 ):
-
     from bisect import bisect
     from datetime import datetime
 

custom_components/zha_toolkit/utils.py

@@ -924,6 +924,7 @@ def wrapper(*args, tries=tries, delay=delay, **kwargs):
 
 # zigpy wrappers
 
+
 # The zigpy library does not offer retryable on read_attributes.
 # Add it ourselves
 @retryable(

custom_components/zha_toolkit/zcl_attr.py

@@ -454,7 +454,6 @@ async def attr_write(  # noqa: C901
         )
         and cmd == "attr_write"
     ):
-
         if result_read is not None:
             event_data["read_before"] = result_read
             result_read = None

custom_components/zha_toolkit/zcl_cmd.py

@@ -97,7 +97,6 @@ async def zcl_cmd(app, listener, ieee, cmd, data, service, params, event_data):
                     False,
                 )
             elif cmd_id not in cluster.server_commands:
-
                 cmd_schema: list[Any] = []
 
                 if cmd_args is not None:

custom_components/zha_toolkit/zdo.py

@@ -138,7 +138,6 @@ async def zdo_scan_now(
 async def zdo_flood_parent_annce(
     app, listener, ieee, cmd, data, service, params, event_data
 ):
-
     LOGGER.debug("flooding network with parent annce")
 
     flooder_task = getattr(app, "flooder_task", None)
@@ -155,7 +154,6 @@ async def zdo_flood_parent_annce(
 
 
 async def _flood_with_parent_annce(app):
-
     coord = app.get_device(app.ieee)
 
     while True:

custom_components/zha_toolkit/zha.py

@@ -77,7 +77,6 @@ async def zha_devices(
             pass
 
     if doGenerateCSV or selectDeviceFields:
-
         if doGenerateCSV:
             # Write CSV header
             u.append_to_csvfile(

pyproject.toml

@@ -0,0 +1,5 @@
+[tool.yamlfix]
+# allow_duplicate_keys = true
+#line_length = 280
+line_length = 80
+# none_representation = "null"

setup.cfg

@@ -34,7 +34,7 @@ max-line-length = 79
 
 [codespell]
 builtin=clear,rare,informal,usage,code,names
-ignore-words-list=hass,master
+ignore-words-list=hass,master,weerd
 skip=./.*
 quiet-level=2