Remove Deconz entity descriptions required fields mixins (#104009)

homeassistant/components/deconz/binary_sensor.py

@@ -65,24 +65,15 @@ T = TypeVar(
 )
 
 
-@dataclass
+@dataclass(kw_only=True)
-class DeconzBinarySensorDescriptionMixin(Generic[T]):
+class DeconzBinarySensorDescription(Generic[T], BinarySensorEntityDescription):
-    """Required values when describing secondary sensor attributes."""
-
-    update_key: str
-    value_fn: Callable[[T], bool | None]
-
-
-@dataclass
-class DeconzBinarySensorDescription(
-    BinarySensorEntityDescription,
-    DeconzBinarySensorDescriptionMixin[T],
-):
     """Class describing deCONZ binary sensor entities."""
 
     instance_check: type[T] | None = None
     name_suffix: str = ""
     old_unique_id_suffix: str = ""
+    update_key: str
+    value_fn: Callable[[T], bool | None]
 
 
 ENTITY_DESCRIPTIONS: tuple[DeconzBinarySensorDescription, ...] = (

homeassistant/components/deconz/button.py

@@ -23,18 +23,13 @@ from .deconz_device import DeconzDevice, DeconzSceneMixin
 from .gateway import DeconzGateway, get_gateway_from_config_entry
 
 
-@dataclass
+@dataclass(kw_only=True)
-class DeconzButtonDescriptionMixin:
+class DeconzButtonDescription(ButtonEntityDescription):
-    """Required values when describing deCONZ button entities."""
-
-    suffix: str
-    button_fn: str
-
-
-@dataclass
-class DeconzButtonDescription(ButtonEntityDescription, DeconzButtonDescriptionMixin):
     """Class describing deCONZ button entities."""
 
+    button_fn: str
+    suffix: str
+
 
 ENTITY_DESCRIPTIONS = {
     PydeconzScene: [

homeassistant/components/deconz/number.py

@@ -31,9 +31,9 @@ from .util import serial_from_unique_id
 T = TypeVar("T", Presence, PydeconzSensorBase)
 
 
-@dataclass
+@dataclass(kw_only=True)
-class DeconzNumberDescriptionMixin(Generic[T]):
+class DeconzNumberDescription(Generic[T], NumberEntityDescription):
-    """Required values when describing deCONZ number entities."""
+    """Class describing deCONZ number entities."""
 
     instance_check: type[T]
     name_suffix: str
@@ -42,11 +42,6 @@ class DeconzNumberDescriptionMixin(Generic[T]):
     value_fn: Callable[[T], float | None]
 
 
-@dataclass
-class DeconzNumberDescription(NumberEntityDescription, DeconzNumberDescriptionMixin[T]):
-    """Class describing deCONZ number entities."""
-
-
 ENTITY_DESCRIPTIONS: tuple[DeconzNumberDescription, ...] = (
     DeconzNumberDescription[Presence](
         key="delay",

homeassistant/components/deconz/sensor.py

@@ -91,22 +91,16 @@ T = TypeVar(
 )
 
 
-@dataclass
+@dataclass(kw_only=True)
-class DeconzSensorDescriptionMixin(Generic[T]):
+class DeconzSensorDescription(Generic[T], SensorEntityDescription):
-    """Required values when describing secondary sensor attributes."""
-
-    supported_fn: Callable[[T], bool]
-    update_key: str
-    value_fn: Callable[[T], datetime | StateType]
-
-
-@dataclass
-class DeconzSensorDescription(SensorEntityDescription, DeconzSensorDescriptionMixin[T]):
     """Class describing deCONZ binary sensor entities."""
 
     instance_check: type[T] | None = None
     name_suffix: str = ""
     old_unique_id_suffix: str = ""
+    supported_fn: Callable[[T], bool]
+    update_key: str
+    value_fn: Callable[[T], datetime | StateType]
 
 
 ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (