Remove platform schema from Hydrawise (#116032)

homeassistant/components/hydrawise/binary_sensor.py

@@ -3,20 +3,15 @@
 from __future__ import annotations
 
 from pydrawise.schema import Zone
-import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
-    PLATFORM_SCHEMA,
     BinarySensorDeviceClass,
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import DOMAIN
 from .coordinator import HydrawiseDataUpdateCoordinator
@@ -39,27 +34,6 @@ BINARY_SENSOR_KEYS: list[str] = [
     desc.key for desc in (BINARY_SENSOR_STATUS, *BINARY_SENSOR_TYPES)
 ]
 
-# Deprecated since Home Assistant 2023.10.0
-# Can be removed completely in 2024.4.0
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_MONITORED_CONDITIONS, default=BINARY_SENSOR_KEYS): vol.All(
-            cv.ensure_list, [vol.In(BINARY_SENSOR_KEYS)]
-        )
-    }
-)
-
-
-def setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up a sensor for a Hydrawise device."""
-    # We don't need to trigger import flow from here as it's triggered from `__init__.py`
-    return  # pragma: no cover
-
 
 async def async_setup_entry(
     hass: HomeAssistant,

homeassistant/components/hydrawise/sensor.py

@@ -5,20 +5,16 @@ from __future__ import annotations
 from datetime import datetime
 
 from pydrawise.schema import Zone
-import voluptuous as vol
 
 from homeassistant.components.sensor import (
-    PLATFORM_SCHEMA,
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_MONITORED_CONDITIONS, UnitOfTime
+from homeassistant.const import UnitOfTime
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
 from .const import DOMAIN
@@ -39,32 +35,10 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
 )
 
 SENSOR_KEYS: list[str] = [desc.key for desc in SENSOR_TYPES]
-
-# Deprecated since Home Assistant 2023.10.0
-# Can be removed completely in 2024.4.0
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_MONITORED_CONDITIONS, default=SENSOR_KEYS): vol.All(
-            cv.ensure_list, [vol.In(SENSOR_KEYS)]
-        )
-    }
-)
-
 TWO_YEAR_SECONDS = 60 * 60 * 24 * 365 * 2
 WATERING_TIME_ICON = "mdi:water-pump"
 
 
-def setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up a sensor for a Hydrawise device."""
-    # We don't need to trigger import flow from here as it's triggered from `__init__.py`
-    return  # pragma: no cover
-
-
 async def async_setup_entry(
     hass: HomeAssistant,
     config_entry: ConfigEntry,

homeassistant/components/hydrawise/switch.py

@@ -6,28 +6,18 @@ from datetime import timedelta
 from typing import Any
 
 from pydrawise.schema import Zone
-import voluptuous as vol
 
 from homeassistant.components.switch import (
-    PLATFORM_SCHEMA,
     SwitchDeviceClass,
     SwitchEntity,
     SwitchEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_MONITORED_CONDITIONS
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
-from .const import (
+from .const import DEFAULT_WATERING_TIME, DOMAIN
-    ALLOWED_WATERING_TIME,
-    CONF_WATERING_TIME,
-    DEFAULT_WATERING_TIME,
-    DOMAIN,
-)
 from .coordinator import HydrawiseDataUpdateCoordinator
 from .entity import HydrawiseEntity
 
@@ -46,30 +36,6 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
 
 SWITCH_KEYS: list[str] = [desc.key for desc in SWITCH_TYPES]
 
-# Deprecated since Home Assistant 2023.10.0
-# Can be removed completely in 2024.4.0
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_MONITORED_CONDITIONS, default=SWITCH_KEYS): vol.All(
-            cv.ensure_list, [vol.In(SWITCH_KEYS)]
-        ),
-        vol.Optional(
-            CONF_WATERING_TIME, default=DEFAULT_WATERING_TIME.total_seconds() // 60
-        ): vol.All(vol.In(ALLOWED_WATERING_TIME)),
-    }
-)
-
-
-def setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up a sensor for a Hydrawise device."""
-    # We don't need to trigger import flow from here as it's triggered from `__init__.py`
-    return  # pragma: no cover
-
 
 async def async_setup_entry(
     hass: HomeAssistant,