more cleanup

tests/test_light.py

@@ -696,8 +696,7 @@ async def test_zha_group_light_entity(
     assert device_3_light_entity is not None
 
     assert (
-        device_1_entity_id != device_2_entity_id
-        and device_1_entity_id != device_3_entity_id
+        device_1_entity_id not in (device_2_entity_id, device_3_entity_id)
     )
     assert device_2_entity_id != device_3_entity_id
 

tests/test_sensor.py

@@ -608,7 +608,7 @@ async def test_unsupported_attributes_sensor(
         find_entity_ids(Platform.SENSOR, zha_device, omit=["lqi", "rssi"])
     )
     assert present_entity_ids == entity_ids
-    assert missing_entity_ids not in present_entity_ids
+    assert missing_entity_ids not in present_entity_ids  # type: ignore[comparison-overlap]
 
 
 @pytest.mark.parametrize(

zha/application/platforms/light/__init__.py

@@ -896,7 +896,7 @@ async def async_update(self) -> None:
             )
             # check if transition started whilst waiting for polled state
             if self.is_transitioning:
-                return
+                return  # type: ignore #TODO figure this out
 
             if state is not None:
                 self._state = state
@@ -910,7 +910,7 @@ async def async_update(self) -> None:
             )
             # check if transition started whilst waiting for polled state
             if self.is_transitioning:
-                return
+                return  # type: ignore #TODO figure this out
             if level is not None:
                 self._brightness = level
 
@@ -946,7 +946,7 @@ async def async_update(self) -> None:
             # for the polled attributes, so abort if we are transitioning,
             # as that state will not be accurate
             if self.is_transitioning:
-                return
+                return  # type: ignore #TODO figure this out
 
             if (color_mode := results.get("color_mode")) is not None:
                 if color_mode == Color.ColorMode.Color_temperature:

zha/application/platforms/light/helpers.py

@@ -357,22 +357,19 @@ def color_xy_brightness_to_RGB(
     b = X * 0.051713 - Y * 0.121364 + Z * 1.011530
 
     # Apply reverse gamma correction.
-    r, g, b = map(
-        lambda x: (12.92 * x)
+    r, g, b = ((12.92 * x)
         if (x <= 0.0031308)
-        else ((1.0 + 0.055) * cast(float, pow(x, (1.0 / 2.4))) - 0.055),
-        [r, g, b],
-    )
+        else ((1.0 + 0.055) * cast(float, pow(x, (1.0 / 2.4))) - 0.055) for x in [r, g, b])
 
     # Bring all negative components to zero.
-    r, g, b = map(lambda x: max(0, x), [r, g, b])
+    r, g, b = (max(0, x) for x in [r, g, b])
 
     # If one component is greater than 1, weight components by that value.
     max_component = max(r, g, b)
     if max_component > 1:
-        r, g, b = map(lambda x: x / max_component, [r, g, b])
+        r, g, b = (x / max_component for x in [r, g, b])
 
-    ir, ig, ib = map(lambda x: int(x * 255), [r, g, b])
+    ir, ig, ib = (int(x * 255) for x in [r, g, b])
 
     return (ir, ig, ib)
 

zha/application/platforms/update.py

@@ -106,6 +106,7 @@ class ZHAFirmwareUpdateEntity(
         | UpdateEntityFeature.PROGRESS
         | UpdateEntityFeature.SPECIFIC_VERSION
     )
+    _attr_in_progress: bool | int = False
 
     def __init__(
         self,