starred/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2026-08-28 02:24:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove number entity support from illuminance triggers and conditions (#166595)

Browse Source
This commit is contained in:
Erik Montnemery
2026-03-26 19:49:38 +00:00
committed by Franck Nijhof
parent 5c53b847dc
commit 16999e3707
6 changed files with 0 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
homeassistant/components/illuminance/condition.py
-2
View File
@@ -6,7 +6,6 @@ from homeassistant.components.binary_sensor import (
DOMAIN as BINARY_SENSOR_DOMAIN,
BinarySensorDeviceClass,
)
from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
from homeassistant.const import LIGHT_LUX, STATE_OFF, STATE_ON
from homeassistant.core import HomeAssistant
@@ -22,7 +21,6 @@ ILLUMINANCE_DETECTED_DOMAIN_SPECS = {
}
ILLUMINANCE_VALUE_DOMAIN_SPECS = {
SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.ILLUMINANCE),
NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.ILLUMINANCE),
}
CONDITIONS: dict[str, type[Condition]] = {
homeassistant/components/illuminance/conditions.yaml
-2
View File
@@ -23,8 +23,6 @@ is_value:
entity:
- domain: sensor
device_class: illuminance
- domain: number
device_class: illuminance
fields:
behavior: *condition_behavior
threshold:
homeassistant/components/illuminance/trigger.py
-2
View File
@@ -6,7 +6,6 @@ from homeassistant.components.binary_sensor import (
DOMAIN as BINARY_SENSOR_DOMAIN,
BinarySensorDeviceClass,
)
from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass
from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
from homeassistant.const import LIGHT_LUX, STATE_OFF, STATE_ON
from homeassistant.core import HomeAssistant
@@ -19,7 +18,6 @@ from homeassistant.helpers.trigger import (
)
ILLUMINANCE_DOMAIN_SPECS: dict[str, DomainSpec] = {
NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.ILLUMINANCE),
SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.ILLUMINANCE),
}
homeassistant/components/illuminance/triggers.yaml
-2
View File
@@ -29,8 +29,6 @@
.trigger_numerical_target: &trigger_numerical_target
entity:
- domain: number
device_class: illuminance
- domain: sensor
device_class: illuminance
tests/components/illuminance/test_condition.py
-78
View File
@@ -40,12 +40,6 @@ async def target_sensors(hass: HomeAssistant) -> dict[str, list[str]]:
return await target_entities(hass, "sensor")
@pytest.fixture
async def target_numbers(hass: HomeAssistant) -> dict[str, list[str]]:
"""Create multiple number entities associated with different targets."""
return await target_entities(hass, "number")
@pytest.mark.parametrize(
"condition",
[
@@ -221,75 +215,3 @@ async def test_illuminance_value_condition_behavior_all(
condition_options=condition_options,
states=states,
)
@pytest.mark.usefixtures("enable_labs_preview_features")
@pytest.mark.parametrize(
("condition_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities("number"),
)
@pytest.mark.parametrize(
("condition", "condition_options", "states"),
parametrize_numerical_condition_above_below_any(
"illuminance.is_value",
device_class="illuminance",
unit_attributes=_ILLUMINANCE_UNIT_ATTRS,
),
)
async def test_illuminance_value_number_condition_behavior_any(
hass: HomeAssistant,
target_numbers: dict[str, list[str]],
condition_target_config: dict,
entity_id: str,
entities_in_target: int,
condition: str,
condition_options: dict[str, Any],
states: list[ConditionStateDescription],
) -> None:
"""Test the illuminance value condition with number entities and 'any' behavior."""
await assert_condition_behavior_any(
hass,
target_entities=target_numbers,
condition_target_config=condition_target_config,
entity_id=entity_id,
entities_in_target=entities_in_target,
condition=condition,
condition_options=condition_options,
states=states,
)
@pytest.mark.usefixtures("enable_labs_preview_features")
@pytest.mark.parametrize(
("condition_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities("number"),
)
@pytest.mark.parametrize(
("condition", "condition_options", "states"),
parametrize_numerical_condition_above_below_all(
"illuminance.is_value",
device_class="illuminance",
unit_attributes=_ILLUMINANCE_UNIT_ATTRS,
),
)
async def test_illuminance_value_number_condition_behavior_all(
hass: HomeAssistant,
target_numbers: dict[str, list[str]],
condition_target_config: dict,
entity_id: str,
entities_in_target: int,
condition: str,
condition_options: dict[str, Any],
states: list[ConditionStateDescription],
) -> None:
"""Test the illuminance value condition with number entities and 'all' behavior."""
await assert_condition_behavior_all(
hass,
target_entities=target_numbers,
condition_target_config=condition_target_config,
entity_id=entity_id,
entities_in_target=entities_in_target,
condition=condition,
condition_options=condition_options,
states=states,
)
tests/components/illuminance/test_trigger.py
-129
View File
@@ -5,7 +5,6 @@ from typing import Any
import pytest
from homeassistant.components.binary_sensor import BinarySensorDeviceClass
from homeassistant.components.number import NumberDeviceClass
from homeassistant.components.sensor import SensorDeviceClass
from homeassistant.const import (
ATTR_DEVICE_CLASS,
@@ -36,12 +35,6 @@ async def target_binary_sensors(hass: HomeAssistant) -> dict[str, list[str]]:
return await target_entities(hass, "binary_sensor")
@pytest.fixture
async def target_numbers(hass: HomeAssistant) -> dict[str, list[str]]:
"""Create multiple number entities associated with different targets."""
return await target_entities(hass, "number")
@pytest.fixture
async def target_sensors(hass: HomeAssistant) -> dict[str, list[str]]:
"""Create multiple sensor entities associated with different targets."""
@@ -340,125 +333,3 @@ async def test_illuminance_trigger_sensor_crossed_threshold_behavior_last(
trigger_options=trigger_options,
states=states,
)
# --- Number changed/crossed_threshold tests ---
@pytest.mark.usefixtures("enable_labs_preview_features")
@pytest.mark.parametrize(
("trigger_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities("number"),
)
@pytest.mark.parametrize(
("trigger", "trigger_options", "states"),
[
*parametrize_numerical_state_value_changed_trigger_states(
"illuminance.changed",
device_class=NumberDeviceClass.ILLUMINANCE,
unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX},
),
*parametrize_numerical_state_value_crossed_threshold_trigger_states(
"illuminance.crossed_threshold",
device_class=NumberDeviceClass.ILLUMINANCE,
unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX},
),
],
)
async def test_illuminance_trigger_number_behavior_any(
hass: HomeAssistant,
target_numbers: dict[str, list[str]],
trigger_target_config: dict,
entity_id: str,
entities_in_target: int,
trigger: str,
trigger_options: dict[str, Any],
states: list[TriggerStateDescription],
) -> None:
"""Test illuminance trigger fires for number entities with device_class illuminance."""
await assert_trigger_behavior_any(
hass,
target_entities=target_numbers,
trigger_target_config=trigger_target_config,
entity_id=entity_id,
entities_in_target=entities_in_target,
trigger=trigger,
trigger_options=trigger_options,
states=states,
)
@pytest.mark.usefixtures("enable_labs_preview_features")
@pytest.mark.parametrize(
("trigger_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities("number"),
)
@pytest.mark.parametrize(
("trigger", "trigger_options", "states"),
[
*parametrize_numerical_state_value_crossed_threshold_trigger_states(
"illuminance.crossed_threshold",
device_class=NumberDeviceClass.ILLUMINANCE,
unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX},
),
],
)
async def test_illuminance_trigger_number_crossed_threshold_behavior_first(
hass: HomeAssistant,
target_numbers: dict[str, list[str]],
trigger_target_config: dict,
entity_id: str,
entities_in_target: int,
trigger: str,
trigger_options: dict[str, Any],
states: list[TriggerStateDescription],
) -> None:
"""Test illuminance crossed_threshold trigger fires on the first number state change."""
await assert_trigger_behavior_first(
hass,
target_entities=target_numbers,
trigger_target_config=trigger_target_config,
entity_id=entity_id,
entities_in_target=entities_in_target,
trigger=trigger,
trigger_options=trigger_options,
states=states,
)
@pytest.mark.usefixtures("enable_labs_preview_features")
@pytest.mark.parametrize(
("trigger_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities("number"),
)
@pytest.mark.parametrize(
("trigger", "trigger_options", "states"),
[
*parametrize_numerical_state_value_crossed_threshold_trigger_states(
"illuminance.crossed_threshold",
device_class=NumberDeviceClass.ILLUMINANCE,
unit_attributes={ATTR_UNIT_OF_MEASUREMENT: LIGHT_LUX},
),
],
)
async def test_illuminance_trigger_number_crossed_threshold_behavior_last(
hass: HomeAssistant,
target_numbers: dict[str, list[str]],
trigger_target_config: dict,
entity_id: str,
entities_in_target: int,
trigger: str,
trigger_options: dict[str, Any],
states: list[TriggerStateDescription],
) -> None:
"""Test illuminance crossed_threshold trigger fires when the last number changes state."""
await assert_trigger_behavior_last(
hass,
target_entities=target_numbers,
trigger_target_config=trigger_target_config,
entity_id=entity_id,
entities_in_target=entities_in_target,
trigger=trigger,
trigger_options=trigger_options,
states=states,
)