From 390b83a9638e7eb515501b848d30e735349f4b48 Mon Sep 17 00:00:00 2001
From: puddly <32534428+puddly@users.noreply.github.com>
Date: Fri, 15 Nov 2024 03:55:22 -0500
Subject: [PATCH] Bump ZHA dependencies (#130563)

---
 homeassistant/components/zha/manifest.json |  2 +-
 homeassistant/components/zha/update.py     | 23 +++++++++++-----------
 requirements_all.txt                       |  4 ++--
 requirements_test_all.txt                  |  4 ++--
 tests/components/zha/test_update.py        |  2 +-
 5 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/homeassistant/components/zha/manifest.json b/homeassistant/components/zha/manifest.json
index 96c9bc030f6..8736dc89549 100644
--- a/homeassistant/components/zha/manifest.json
+++ b/homeassistant/components/zha/manifest.json
@@ -21,7 +21,7 @@
     "zha",
     "universal_silabs_flasher"
   ],
-  "requirements": ["universal-silabs-flasher==0.0.24", "zha==0.0.37"],
+  "requirements": ["universal-silabs-flasher==0.0.25", "zha==0.0.39"],
   "usb": [
     {
       "vid": "10C4",
diff --git a/homeassistant/components/zha/update.py b/homeassistant/components/zha/update.py
index 151d1c495e8..18b8ed1cca5 100644
--- a/homeassistant/components/zha/update.py
+++ b/homeassistant/components/zha/update.py
@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import functools
 import logging
-import math
 from typing import Any
 
 from zha.exceptions import ZHAException
@@ -97,6 +96,7 @@ class ZHAFirmwareUpdateEntity(
         | UpdateEntityFeature.SPECIFIC_VERSION
         | UpdateEntityFeature.RELEASE_NOTES
     )
+    _attr_display_precision = 2  # 40 byte chunks with ~200KB files increments by 0.02%
 
     def __init__(self, entity_data: EntityData, **kwargs: Any) -> None:
         """Initialize the ZHA siren."""
@@ -115,20 +115,19 @@ class ZHAFirmwareUpdateEntity(
     def in_progress(self) -> bool | int | None:
         """Update installation progress.
 
+        Should return a boolean (True if in progress, False if not).
+        """
+        return self.entity_data.entity.in_progress
+
+    @property
+    def update_percentage(self) -> int | float | None:
+        """Update installation progress.
+
         Needs UpdateEntityFeature.PROGRESS flag to be set for it to be used.
 
-        Can either return a boolean (True if in progress, False if not)
-        or an integer to indicate the progress in from 0 to 100%.
+        Can either return a number to indicate the progress from 0 to 100% or None.
         """
-        if not self.entity_data.entity.in_progress:
-            return self.entity_data.entity.in_progress
-
-        # Stay in an indeterminate state until we actually send something
-        if self.entity_data.entity.progress == 0:
-            return True
-
-        # Rescale 0-100% to 2-100% to avoid 0 and 1 colliding with None, False, and True
-        return int(math.ceil(2 + 98 * self.entity_data.entity.progress / 100))
+        return self.entity_data.entity.update_percentage
 
     @property
     def latest_version(self) -> str | None:
diff --git a/requirements_all.txt b/requirements_all.txt
index 4a408751692..3d6a152ed58 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -2912,7 +2912,7 @@ unifi_ap==0.0.1
 unifiled==0.11
 
 # homeassistant.components.zha
-universal-silabs-flasher==0.0.24
+universal-silabs-flasher==0.0.25
 
 # homeassistant.components.upb
 upb-lib==0.5.8
@@ -3081,7 +3081,7 @@ zeroconf==0.136.0
 zeversolar==0.3.2
 
 # homeassistant.components.zha
-zha==0.0.37
+zha==0.0.39
 
 # homeassistant.components.zhong_hong
 zhong-hong-hvac==1.0.13
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 03c53a1ca97..e382455593c 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -2319,7 +2319,7 @@ ultraheat-api==0.5.7
 unifi-discovery==1.2.0
 
 # homeassistant.components.zha
-universal-silabs-flasher==0.0.24
+universal-silabs-flasher==0.0.25
 
 # homeassistant.components.upb
 upb-lib==0.5.8
@@ -2464,7 +2464,7 @@ zeroconf==0.136.0
 zeversolar==0.3.2
 
 # homeassistant.components.zha
-zha==0.0.37
+zha==0.0.39
 
 # homeassistant.components.zwave_js
 zwave-js-server-python==0.59.1
diff --git a/tests/components/zha/test_update.py b/tests/components/zha/test_update.py
index 4b6dff4fc6b..cd48ae62ff3 100644
--- a/tests/components/zha/test_update.py
+++ b/tests/components/zha/test_update.py
@@ -394,7 +394,7 @@ async def test_firmware_update_success(
                         attrs[ATTR_INSTALLED_VERSION] == f"0x{installed_fw_version:08x}"
                     )
                     assert attrs[ATTR_IN_PROGRESS] is True
-                    assert attrs[ATTR_UPDATE_PERCENTAGE] == 58
+                    assert attrs[ATTR_UPDATE_PERCENTAGE] == pytest.approx(100 * 40 / 70)
                     assert (
                         attrs[ATTR_LATEST_VERSION]
                         == f"0x{fw_image.firmware.header.file_version:08x}"