From db65225b21decf0bf730fb4191ce669af6d8fb3e Mon Sep 17 00:00:00 2001
From: mdeweerd <mdeweerd@users.noreply.github.com>
Date: Mon, 5 Feb 2024 23:50:24 +0100
Subject: [PATCH] Update annotation method

---
 .github/workflows/pre-commit.yml            | 28 +++++++++++++--------
 .pre-commit-config.yaml                     |  4 +--
 examples/script_danfoss_ally_configure.yaml |  2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 3092ca3..c6eea64 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -20,7 +20,7 @@ jobs:
           cache: pip
           python-version: 3.12.1
       - run: python -m pip install pre-commit regex
-      - uses: actions/cache/restore@v3
+      - uses: actions/cache/restore@v4
         with:
           path: ~/.cache/pre-commit/
           key: pre-commit-4|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml')
@@ -32,17 +32,25 @@ jobs:
           set -o pipefail
           pre-commit gc
           pre-commit run --show-diff-on-failure --color=always --all-files | tee ${RAW_LOG}
-      - name: Convert Raw Log to CheckStyle format
-        if: ${{ failure() }}
-        run: |
-          python ${LOG_TO_CS} ${RAW_LOG} ${CS_XML}
-      - name: Annotate Source Code with Messages
-        uses: staabm/annotate-pull-request-from-checkstyle-action@v1
+      - name: Convert Raw Log to annotations
+        uses: mdeweerd/logToCheckStyle@v2024.2.2
         if: ${{ failure() }}
         with:
-          files: ${{ env.CS_XML }}
-          notices-as-warnings: true  # optional
-          prepend-filename: true  # optional
+          in: ${{ env.RAW_LOG }}
+          # Out can be omitted if you do not need the xml output
+          # out: ${{ env.CS_XML }}
+
+      # - name: Convert Raw Log to CheckStyle format
+      #   if: ${{ failure() }}
+      #   run: |
+      #     python ${LOG_TO_CS} ${RAW_LOG} ${CS_XML}
+      # - name: Annotate Source Code with Messages
+      #   uses: staabm/annotate-pull-request-from-checkstyle-action@v1
+      #   if: ${{ failure() }}
+      #   with:
+      #     files: ${{ env.CS_XML }}
+      #     notices-as-warnings: true  # optional
+      #     prepend-filename: true  # optional
       - uses: actions/cache/save@v3
         if: ${{ always() }}
         with:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 16b0745..cbab94e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -163,7 +163,7 @@ repos:
           - --show-error-codes
           - --show-error-context
         additional_dependencies:
-          - zigpy>=0.43.0
-          - cryptography==3.3.2  # Compatible/Available on cygwin
+          - zigpy==0.61.0
+          # - cryptography==3.3.2  # Compatible/Available on cygwin
           #- homeassistant-stubs>=2023.1.7
           #- pydantic
diff --git a/examples/script_danfoss_ally_configure.yaml b/examples/script_danfoss_ally_configure.yaml
index a08c802..54689ec 100644
--- a/examples/script_danfoss_ally_configure.yaml
+++ b/examples/script_danfoss_ally_configure.yaml
@@ -189,7 +189,7 @@ fields:
   orientation:
     name: TRV orientation
     description: >-
-      - When false, mounted horizontaly, - When true, mounted vertically. This
+      - When false, mounted horizontally, - When true, mounted vertically. This
       selects the temperature gradient measured in the valve on radiator.
     default: false
     example: false