From 4d27a32905eb2e543846eef51c37e125b2b128c4 Mon Sep 17 00:00:00 2001
From: Robert Resch <robert@resch.dev>
Date: Thu, 28 Nov 2024 12:14:25 +0100
Subject: [PATCH] Remove deprecated cover constants (#131797)
---
homeassistant/components/cover/__init__.py | 51 +---------------------
tests/components/cover/test_init.py | 22 +---------
2 files changed, 2 insertions(+), 71 deletions(-)
diff --git a/homeassistant/components/cover/__init__.py b/homeassistant/components/cover/__init__.py
index ea11761a753..001bff51991 100644
--- a/homeassistant/components/cover/__init__.py
+++ b/homeassistant/components/cover/__init__.py
@@ -89,36 +89,8 @@ class CoverDeviceClass(StrEnum):
DEVICE_CLASSES_SCHEMA = vol.All(vol.Lower, vol.Coerce(CoverDeviceClass))
-
-# DEVICE_CLASS* below are deprecated as of 2021.12
-# use the CoverDeviceClass enum instead.
DEVICE_CLASSES = [cls.value for cls in CoverDeviceClass]
-_DEPRECATED_DEVICE_CLASS_AWNING = DeprecatedConstantEnum(
- CoverDeviceClass.AWNING, "2025.1"
-)
-_DEPRECATED_DEVICE_CLASS_BLIND = DeprecatedConstantEnum(
- CoverDeviceClass.BLIND, "2025.1"
-)
-_DEPRECATED_DEVICE_CLASS_CURTAIN = DeprecatedConstantEnum(
- CoverDeviceClass.CURTAIN, "2025.1"
-)
-_DEPRECATED_DEVICE_CLASS_DAMPER = DeprecatedConstantEnum(
- CoverDeviceClass.DAMPER, "2025.1"
-)
-_DEPRECATED_DEVICE_CLASS_DOOR = DeprecatedConstantEnum(CoverDeviceClass.DOOR, "2025.1")
-_DEPRECATED_DEVICE_CLASS_GARAGE = DeprecatedConstantEnum(
- CoverDeviceClass.GARAGE, "2025.1"
-)
-_DEPRECATED_DEVICE_CLASS_GATE = DeprecatedConstantEnum(CoverDeviceClass.GATE, "2025.1")
-_DEPRECATED_DEVICE_CLASS_SHADE = DeprecatedConstantEnum(
- CoverDeviceClass.SHADE, "2025.1"
-)
-_DEPRECATED_DEVICE_CLASS_SHUTTER = DeprecatedConstantEnum(
- CoverDeviceClass.SHUTTER, "2025.1"
-)
-_DEPRECATED_DEVICE_CLASS_WINDOW = DeprecatedConstantEnum(
- CoverDeviceClass.WINDOW, "2025.1"
-)
+
# mypy: disallow-any-generics
@@ -136,27 +108,6 @@ class CoverEntityFeature(IntFlag):
SET_TILT_POSITION = 128
-# These SUPPORT_* constants are deprecated as of Home Assistant 2022.5.
-# Please use the CoverEntityFeature enum instead.
-_DEPRECATED_SUPPORT_OPEN = DeprecatedConstantEnum(CoverEntityFeature.OPEN, "2025.1")
-_DEPRECATED_SUPPORT_CLOSE = DeprecatedConstantEnum(CoverEntityFeature.CLOSE, "2025.1")
-_DEPRECATED_SUPPORT_SET_POSITION = DeprecatedConstantEnum(
- CoverEntityFeature.SET_POSITION, "2025.1"
-)
-_DEPRECATED_SUPPORT_STOP = DeprecatedConstantEnum(CoverEntityFeature.STOP, "2025.1")
-_DEPRECATED_SUPPORT_OPEN_TILT = DeprecatedConstantEnum(
- CoverEntityFeature.OPEN_TILT, "2025.1"
-)
-_DEPRECATED_SUPPORT_CLOSE_TILT = DeprecatedConstantEnum(
- CoverEntityFeature.CLOSE_TILT, "2025.1"
-)
-_DEPRECATED_SUPPORT_STOP_TILT = DeprecatedConstantEnum(
- CoverEntityFeature.STOP_TILT, "2025.1"
-)
-_DEPRECATED_SUPPORT_SET_TILT_POSITION = DeprecatedConstantEnum(
- CoverEntityFeature.SET_TILT_POSITION, "2025.1"
-)
-
ATTR_CURRENT_POSITION = "current_position"
ATTR_CURRENT_TILT_POSITION = "current_tilt_position"
ATTR_POSITION = "position"
diff --git a/tests/components/cover/test_init.py b/tests/components/cover/test_init.py
index 6b80dd1ab9a..646c44e4ac2 100644
--- a/tests/components/cover/test_init.py
+++ b/tests/components/cover/test_init.py
@@ -13,11 +13,7 @@ from homeassistant.setup import async_setup_component
from .common import MockCover
-from tests.common import (
- help_test_all,
- import_and_test_deprecated_constant_enum,
- setup_test_component_platform,
-)
+from tests.common import help_test_all, setup_test_component_platform
async def test_services(
@@ -161,22 +157,6 @@ def test_all() -> None:
help_test_all(cover)
-@pytest.mark.parametrize(
- ("enum", "constant_prefix"),
- _create_tuples(cover.CoverEntityFeature, "SUPPORT_")
- + _create_tuples(cover.CoverDeviceClass, "DEVICE_CLASS_"),
-)
-def test_deprecated_constants(
- caplog: pytest.LogCaptureFixture,
- enum: Enum,
- constant_prefix: str,
-) -> None:
- """Test deprecated constants."""
- import_and_test_deprecated_constant_enum(
- caplog, cover, enum, constant_prefix, "2025.1"
- )
-
-
def test_deprecated_supported_features_ints(caplog: pytest.LogCaptureFixture) -> None:
"""Test deprecated supported features ints."""
--
GitLab