From 01effb7ca68b0ec8f411309ac052f2e2eab9c396 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Wed, 15 Oct 2025 22:59:40 +0200 Subject: [PATCH] Remove hardware from _IGNORE_ROOT_IMPORT in pylint plugin (#154532) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Abílio Costa --- homeassistant/components/hardkernel/hardware.py | 2 +- homeassistant/components/hardware/__init__.py | 8 +++++++- .../components/homeassistant_connect_zbt2/hardware.py | 2 +- homeassistant/components/homeassistant_green/hardware.py | 2 +- .../components/homeassistant_sky_connect/hardware.py | 2 +- homeassistant/components/homeassistant_yellow/hardware.py | 2 +- homeassistant/components/raspberry_pi/hardware.py | 2 +- pylint/plugins/hass_imports.py | 1 - 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/hardkernel/hardware.py b/homeassistant/components/hardkernel/hardware.py index 86dcf073680..45af8b4e146 100644 --- a/homeassistant/components/hardkernel/hardware.py +++ b/homeassistant/components/hardkernel/hardware.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.hardware.models import BoardInfo, HardwareInfo +from homeassistant.components.hardware import BoardInfo, HardwareInfo from homeassistant.components.hassio import get_os_info from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError diff --git a/homeassistant/components/hardware/__init__.py b/homeassistant/components/hardware/__init__.py index 5db9671a4ed..7d616ef4cef 100644 --- a/homeassistant/components/hardware/__init__.py +++ b/homeassistant/components/hardware/__init__.py @@ -11,7 +11,13 @@ from homeassistant.helpers.typing import ConfigType from . import websocket_api from .const import DATA_HARDWARE, DOMAIN from .hardware import async_process_hardware_platforms -from .models import HardwareData, SystemStatus +from .models import BoardInfo, HardwareData, HardwareInfo, SystemStatus, USBInfo + +__all__ = [ + "BoardInfo", + "HardwareInfo", + "USBInfo", +] CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN) diff --git a/homeassistant/components/homeassistant_connect_zbt2/hardware.py b/homeassistant/components/homeassistant_connect_zbt2/hardware.py index 8367df6501d..0d45e055407 100644 --- a/homeassistant/components/homeassistant_connect_zbt2/hardware.py +++ b/homeassistant/components/homeassistant_connect_zbt2/hardware.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.hardware.models import HardwareInfo, USBInfo +from homeassistant.components.hardware import HardwareInfo, USBInfo from homeassistant.core import HomeAssistant, callback from .config_flow import HomeAssistantConnectZBT2ConfigFlow diff --git a/homeassistant/components/homeassistant_green/hardware.py b/homeassistant/components/homeassistant_green/hardware.py index bf0decb9d05..825eede5653 100644 --- a/homeassistant/components/homeassistant_green/hardware.py +++ b/homeassistant/components/homeassistant_green/hardware.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.hardware.models import BoardInfo, HardwareInfo +from homeassistant.components.hardware import BoardInfo, HardwareInfo from homeassistant.components.hassio import get_os_info from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError diff --git a/homeassistant/components/homeassistant_sky_connect/hardware.py b/homeassistant/components/homeassistant_sky_connect/hardware.py index bf4ffefdc75..90ac80bf49a 100644 --- a/homeassistant/components/homeassistant_sky_connect/hardware.py +++ b/homeassistant/components/homeassistant_sky_connect/hardware.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.hardware.models import HardwareInfo, USBInfo +from homeassistant.components.hardware import HardwareInfo, USBInfo from homeassistant.core import HomeAssistant, callback from .config_flow import HomeAssistantSkyConnectConfigFlow diff --git a/homeassistant/components/homeassistant_yellow/hardware.py b/homeassistant/components/homeassistant_yellow/hardware.py index 2064f33484c..0772b27f936 100644 --- a/homeassistant/components/homeassistant_yellow/hardware.py +++ b/homeassistant/components/homeassistant_yellow/hardware.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.hardware.models import BoardInfo, HardwareInfo +from homeassistant.components.hardware import BoardInfo, HardwareInfo from homeassistant.components.hassio import get_os_info from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError diff --git a/homeassistant/components/raspberry_pi/hardware.py b/homeassistant/components/raspberry_pi/hardware.py index 54d375c7b6e..1386f8628b3 100644 --- a/homeassistant/components/raspberry_pi/hardware.py +++ b/homeassistant/components/raspberry_pi/hardware.py @@ -2,7 +2,7 @@ from __future__ import annotations -from homeassistant.components.hardware.models import BoardInfo, HardwareInfo +from homeassistant.components.hardware import BoardInfo, HardwareInfo from homeassistant.components.hassio import get_os_info from homeassistant.core import HomeAssistant, callback from homeassistant.exceptions import HomeAssistantError diff --git a/pylint/plugins/hass_imports.py b/pylint/plugins/hass_imports.py index b791b7db6fe..ede92875e1b 100644 --- a/pylint/plugins/hass_imports.py +++ b/pylint/plugins/hass_imports.py @@ -136,7 +136,6 @@ _IGNORE_ROOT_IMPORT = ( "ffmpeg", "ffmpeg_motion", "google_assistant", - "hardware", "homeassistant", "homeassistant_hardware", "http",