From 0018fb4fe2dc91f9027498452c43a3678f062cdb Mon Sep 17 00:00:00 2001 From: Dan Ponte Date: Wed, 5 Jun 2024 16:40:00 -0400 Subject: [PATCH] Remove bluetooth and isal --- .../components/default_config/__init__.py | 3 +++ .../components/default_config/manifest.json | 1 - .../components/esphome/diagnostics.py | 13 ------------ homeassistant/components/esphome/manager.py | 4 +--- homeassistant/components/isal/__init__.py | 20 ------------------- homeassistant/components/isal/manifest.json | 10 ---------- homeassistant/package_constraints.txt | 7 ------- requirements_all.txt | 3 --- requirements_test_all.txt | 3 --- 9 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 homeassistant/components/isal/__init__.py delete mode 100644 homeassistant/components/isal/manifest.json diff --git a/homeassistant/components/default_config/__init__.py b/homeassistant/components/default_config/__init__.py index e7302528b2e90..6de2ecd857f27 100644 --- a/homeassistant/components/default_config/__init__.py +++ b/homeassistant/components/default_config/__init__.py @@ -11,4 +11,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: """Initialize default configuration.""" + if sys.platform.startswith(("linux", "win32", "darwin")): + await async_setup_component(hass, "bluetooth", config) + return True diff --git a/homeassistant/components/default_config/manifest.json b/homeassistant/components/default_config/manifest.json index cbadb704a427e..de972ec1a91f7 100644 --- a/homeassistant/components/default_config/manifest.json +++ b/homeassistant/components/default_config/manifest.json @@ -4,7 +4,6 @@ "codeowners": ["@home-assistant/core"], "dependencies": [ "assist_pipeline", - "bluetooth", "cloud", "conversation", "dhcp", diff --git a/homeassistant/components/esphome/diagnostics.py b/homeassistant/components/esphome/diagnostics.py index 58c9a8fe666ef..bcb907b3b4fc1 100644 --- a/homeassistant/components/esphome/diagnostics.py +++ b/homeassistant/components/esphome/diagnostics.py @@ -4,7 +4,6 @@ from typing import Any -from homeassistant.components.bluetooth import async_scanner_by_source from homeassistant.components.diagnostics import async_redact_data from homeassistant.const import CONF_PASSWORD from homeassistant.core import HomeAssistant @@ -31,18 +30,6 @@ async def async_get_config_entry_diagnostics( if (storage_data := await entry_data.store.async_load()) is not None: diag["storage_data"] = storage_data - if ( - config_entry.unique_id - and (scanner := async_scanner_by_source(hass, config_entry.unique_id.upper())) - and (bluetooth_device := entry_data.bluetooth_device) - ): - diag["bluetooth"] = { - "connections_free": bluetooth_device.ble_connections_free, - "connections_limit": bluetooth_device.ble_connections_limit, - "available": bluetooth_device.available, - "scanner": await scanner.async_diagnostics(), - } - if dashboard := async_get_dashboard(hass): diag["dashboard"] = dashboard.addon_slug diff --git a/homeassistant/components/esphome/manager.py b/homeassistant/components/esphome/manager.py index 93e8d7b5bc206..15c99312ac5b2 100644 --- a/homeassistant/components/esphome/manager.py +++ b/homeassistant/components/esphome/manager.py @@ -57,7 +57,6 @@ from homeassistant.helpers.template import Template from homeassistant.util.async_ import create_eager_task -from .bluetooth import async_connect_scanner from .const import ( CONF_ALLOW_SERVICE_CALLS, CONF_DEVICE_NAME, @@ -91,10 +90,9 @@ def _async_check_firmware_version( # ESPHome device_info.mac_address is the unique_id issue = f"ble_firmware_outdated-{device_info.mac_address}" if ( - not device_info.bluetooth_proxy_feature_flags_compat(api_version) # If the device has a project name its up to that project # to tell them about the firmware version update so we don't notify here - or (device_info.project_name and device_info.project_name not in PROJECT_URLS) + (device_info.project_name and device_info.project_name not in PROJECT_URLS) or AwesomeVersion(device_info.esphome_version) >= STABLE_BLE_VERSION ): async_delete_issue(hass, DOMAIN, issue) diff --git a/homeassistant/components/isal/__init__.py b/homeassistant/components/isal/__init__.py deleted file mode 100644 index 3df59b7ea9f6f..0000000000000 --- a/homeassistant/components/isal/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -"""The isal integration.""" - -from __future__ import annotations - -from homeassistant.core import HomeAssistant -from homeassistant.helpers import config_validation as cv -from homeassistant.helpers.typing import ConfigType - -DOMAIN = "isal" - -CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN) - - -async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: - """Set up up isal. - - This integration is only used so that isal can be an optional - dep for aiohttp-fast-zlib. - """ - return True diff --git a/homeassistant/components/isal/manifest.json b/homeassistant/components/isal/manifest.json deleted file mode 100644 index d367b1c8eb9eb..0000000000000 --- a/homeassistant/components/isal/manifest.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "domain": "isal", - "name": "Intelligent Storage Acceleration", - "codeowners": ["@bdraco"], - "documentation": "https://www.home-assistant.io/integrations/isal", - "integration_type": "system", - "iot_class": "local_polling", - "quality_scale": "internal", - "requirements": ["isal==1.6.1"] -} diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index fd878c1ffcfcf..8fee4d3a5cedd 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -14,20 +14,13 @@ atomicwrites-homeassistant==1.4.1 attrs==23.2.0 awesomeversion==24.6.0 bcrypt==4.1.3 -bleak-retry-connector==3.5.0 -bleak==0.22.2 -bluetooth-adapters==0.19.4 -bluetooth-auto-recovery==1.4.2 -bluetooth-data-tools==1.20.0 cached-ipaddress==0.5.0 certifi>=2021.5.30 ciso8601==2.3.1 cryptography==43.0.0 -dbus-fast==2.24.0 fnv-hash-fast==1.0.2 ha-av==10.1.1 ha-ffmpeg==3.2.0 -habluetooth==3.4.0 hass-nabucasa==0.81.1 hassil==1.7.4 home-assistant-bluetooth==1.12.2 diff --git a/requirements_all.txt b/requirements_all.txt index 59e9f95e93efe..cd6c7f75234b4 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1187,9 +1187,6 @@ iottycloud==0.1.3 # homeassistant.components.iperf3 iperf3==0.1.11 -# homeassistant.components.isal -isal==1.6.1 - # homeassistant.components.gogogate2 ismartgate==5.0.1 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index ace1c743fe0be..6c7a55b8bf6de 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -992,9 +992,6 @@ intellifire4py==4.1.9 # homeassistant.components.iotty iottycloud==0.1.3 -# homeassistant.components.isal -isal==1.6.1 - # homeassistant.components.gogogate2 ismartgate==5.0.1