add turned_off and turned_on triggers

2025-12-15 12:29:38 +00:00 · 2025-12-12 20:53:03 +00:00
208 changed files with 1313 additions and 4435 deletions
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -15,7 +15,7 @@ env:
  UV_HTTP_TIMEOUT: 60
  UV_SYSTEM_PYTHON: "true"
  # Base image version from https://github.com/home-assistant/docker
-  BASE_IMAGE_VERSION: "2025.12.0"
+  BASE_IMAGE_VERSION: "2025.11.3"
  ARCHITECTURES: '["amd64", "aarch64"]'

 jobs:
@@ -70,7 +70,7 @@ jobs:
        run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -

      - name: Upload translations
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: translations
          path: translations.tar.gz
@@ -169,7 +169,7 @@ jobs:
          fi

      - name: Download translations
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: translations

@@ -482,7 +482,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}

      - name: Download translations
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: translations

--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -263,7 +263,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: &actions-cache actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: &actions-cache actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
        with:
          path: venv
          key: &key-pre-commit-venv >-
@@ -304,7 +304,7 @@ jobs:
      - &cache-restore-pre-commit-venv
        name: Restore base Python virtual environment
        id: cache-venv
-        uses: &actions-cache-restore actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: &actions-cache-restore actions/cache/restore@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
        with:
          path: venv
          fail-on-cache-miss: true
@@ -511,7 +511,7 @@ jobs:
          fi
      - name: Save apt cache
        if: steps.cache-apt-check.outputs.cache-hit != 'true'
-        uses: &actions-cache-save actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: &actions-cache-save actions/cache/save@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
        with:
          path: *path-apt-cache
          key: *key-apt-cache
@@ -534,7 +534,7 @@ jobs:
          python --version
          uv pip freeze >> pip_freeze.txt
      - name: Upload pip_freeze artifact
-        uses: &actions-upload-artifact actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: pip-freeze-${{ matrix.python-version }}
          path: pip_freeze.txt
@@ -864,7 +864,7 @@ jobs:
        run: |
          echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
      - name: Download pytest_buckets
-        uses: &actions-download-artifact actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: &actions-download-artifact actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: pytest_buckets
      - &compile-english-translations
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,11 +24,11 @@ jobs:
        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
        with:
          category: "/language:python"
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -10,7 +10,7 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: "30"
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -74,7 +74,7 @@ jobs:
          ) > .env_file

      - name: Upload env_file
-        uses: &actions-upload-artifact actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: env_file
          path: ./.env_file
@@ -119,7 +119,7 @@ jobs:

      - &download-env-file
        name: Download env_file
-        uses: &actions-download-artifact actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: &actions-download-artifact actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: env_file

--- a/8
+++ b/8
@@ -220,8 +220,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/bizkaibus/ @UgaitzEtxebarria
 /homeassistant/components/blebox/ @bbx-a @swistakm
 /tests/components/blebox/ @bbx-a @swistakm
-/homeassistant/components/blink/ @fronzbot
-/tests/components/blink/ @fronzbot
+/homeassistant/components/blink/ @fronzbot @mkmer
+/tests/components/blink/ @fronzbot @mkmer
 /homeassistant/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
 /tests/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
 /homeassistant/components/bluemaestro/ @bdraco
@@ -308,8 +308,8 @@ build.json @home-assistant/supervisor
 /tests/components/config/ @home-assistant/core
 /homeassistant/components/configurator/ @home-assistant/core
 /tests/components/configurator/ @home-assistant/core
-/homeassistant/components/control4/ @lawtancool @davidrecordon
-/tests/components/control4/ @lawtancool @davidrecordon
+/homeassistant/components/control4/ @lawtancool
+/tests/components/control4/ @lawtancool
 /homeassistant/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
 /tests/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
 /homeassistant/components/cookidoo/ @miaucl
--- a/2
+++ b/2
@@ -30,7 +30,7 @@ RUN \
    # Verify go2rtc can be executed
    go2rtc --version \
    # Install uv
-    && pip3 install uv==0.9.17
+    && pip3 install uv==0.9.6

 WORKDIR /usr/src

--- a/homeassistant/components/advantage_air/manifest.json
+++ b/homeassistant/components/advantage_air/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Bre77"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/advantage_air",
-  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["advantage_air"],
  "requirements": ["advantage-air==0.4.4"]
--- a/homeassistant/components/aemet/manifest.json
+++ b/homeassistant/components/aemet/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Noltari"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aemet",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["aemet_opendata"],
  "requirements": ["AEMET-OpenData==0.6.4"]
--- a/homeassistant/components/aftership/manifest.json
+++ b/homeassistant/components/aftership/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": [],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aftership",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "requirements": ["pyaftership==21.11.0"]
 }
--- a/homeassistant/components/agent_dvr/manifest.json
+++ b/homeassistant/components/agent_dvr/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@ispysoftware"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/agent_dvr",
-  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["agent"],
  "requirements": ["agent-py==0.0.24"]
--- a/homeassistant/components/airnow/manifest.json
+++ b/homeassistant/components/airnow/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@asymworks"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/airnow",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["pyairnow"],
  "requirements": ["pyairnow==1.3.1"]
--- a/homeassistant/components/airobot/sensor.py
+++ b/homeassistant/components/airobot/sensor.py
@@ -4,7 +4,6 @@ from __future__ import annotations

 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime, timedelta

 from pyairobotrest.models import ThermostatStatus

@@ -24,8 +23,6 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from homeassistant.util.dt import utcnow
-from homeassistant.util.variance import ignore_variance

 from . import AirobotConfigEntry
 from .entity import AirobotEntity
@@ -37,15 +34,10 @@ PARALLEL_UPDATES = 0
 class AirobotSensorEntityDescription(SensorEntityDescription):
    """Describes Airobot sensor entity."""

-    value_fn: Callable[[ThermostatStatus], StateType | datetime]
+    value_fn: Callable[[ThermostatStatus], StateType]
    supported_fn: Callable[[ThermostatStatus], bool] = lambda _: True


-uptime_to_stable_datetime = ignore_variance(
-    lambda value: utcnow().replace(microsecond=0) - timedelta(seconds=value),
-    timedelta(minutes=2),
-)
-
 SENSOR_TYPES: tuple[AirobotSensorEntityDescription, ...] = (
    AirobotSensorEntityDescription(
        key="air_temperature",
@@ -104,14 +96,6 @@ SENSOR_TYPES: tuple[AirobotSensorEntityDescription, ...] = (
        entity_category=EntityCategory.DIAGNOSTIC,
        value_fn=lambda status: status.errors,
    ),
-    AirobotSensorEntityDescription(
-        key="device_uptime",
-        translation_key="device_uptime",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda status: uptime_to_stable_datetime(status.device_uptime),
-        entity_registry_enabled_default=False,
-    ),
 )


@@ -145,6 +129,6 @@ class AirobotSensor(AirobotEntity, SensorEntity):
        self._attr_unique_id = f"{coordinator.data.status.device_id}_{description.key}"

    @property
-    def native_value(self) -> StateType | datetime:
+    def native_value(self) -> StateType:
        """Return the state of the sensor."""
        return self.entity_description.value_fn(self.coordinator.data.status)
--- a/homeassistant/components/airthings/manifest.json
+++ b/homeassistant/components/airthings/manifest.json
@@ -17,7 +17,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/airthings",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["airthings"],
  "requirements": ["airthings-cloud==0.2.0"]
--- a/homeassistant/components/airthings_ble/manifest.json
+++ b/homeassistant/components/airthings_ble/manifest.json
@@ -27,7 +27,6 @@
  "config_flow": true,
  "dependencies": ["bluetooth_adapters"],
  "documentation": "https://www.home-assistant.io/integrations/airthings_ble",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "requirements": ["airthings-ble==1.2.0"]
 }
--- a/homeassistant/components/airtouch4/manifest.json
+++ b/homeassistant/components/airtouch4/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@samsinnamon"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/airtouch4",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["airtouch4pyapi"],
  "requirements": ["airtouch4pyapi==1.0.5"]
--- a/homeassistant/components/airtouch5/manifest.json
+++ b/homeassistant/components/airtouch5/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@danzel"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/airtouch5",
-  "integration_type": "hub",
  "iot_class": "local_push",
  "loggers": ["airtouch5py"],
  "requirements": ["airtouch5py==0.3.0"]
--- a/homeassistant/components/airzone/manifest.json
+++ b/homeassistant/components/airzone/manifest.json
@@ -9,7 +9,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/airzone",
-  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["aioairzone"],
  "requirements": ["aioairzone==1.0.4"]
--- a/homeassistant/components/airzone_cloud/manifest.json
+++ b/homeassistant/components/airzone_cloud/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Noltari"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
-  "integration_type": "hub",
  "iot_class": "cloud_push",
  "loggers": ["aioairzone_cloud"],
  "requirements": ["aioairzone-cloud==0.7.2"]
--- a/homeassistant/components/amberelectric/manifest.json
+++ b/homeassistant/components/amberelectric/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@madpilot"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/amberelectric",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["amberelectric"],
  "requirements": ["amberelectric==2.0.12"]
--- a/homeassistant/components/android_ip_webcam/manifest.json
+++ b/homeassistant/components/android_ip_webcam/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@engrbm87"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/android_ip_webcam",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "requirements": ["pydroid-ipcam==3.0.0"]
 }
--- a/homeassistant/components/anglian_water/manifest.json
+++ b/homeassistant/components/anglian_water/manifest.json
@@ -4,9 +4,8 @@
  "codeowners": ["@pantherale0"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/anglian_water",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["pyanglianwater"],
  "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.1.0"]
+  "requirements": ["pyanglianwater==3.0.0"]
 }
--- a/homeassistant/components/anova/manifest.json
+++ b/homeassistant/components/anova/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Lash-L"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/anova",
-  "integration_type": "hub",
  "iot_class": "cloud_push",
  "loggers": ["anova_wifi"],
  "requirements": ["anova-wifi==0.17.0"]
--- a/homeassistant/components/anthemav/manifest.json
+++ b/homeassistant/components/anthemav/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@hyralex"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/anthemav",
-  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["anthemav"],
  "requirements": ["anthemav==1.4.1"]
--- a/homeassistant/components/aosmith/manifest.json
+++ b/homeassistant/components/aosmith/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@bdr99"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aosmith",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "requirements": ["py-aosmith==1.0.15"]
 }
--- a/homeassistant/components/arcam_fmj/manifest.json
+++ b/homeassistant/components/arcam_fmj/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@elupus"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/arcam_fmj",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["arcam"],
  "requirements": ["arcam-fmj==1.8.2"],
--- a/homeassistant/components/arve/manifest.json
+++ b/homeassistant/components/arve/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@ikalnyi"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/arve",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "requirements": ["asyncarve==0.1.1"]
 }
--- a/homeassistant/components/aseko_pool_live/manifest.json
+++ b/homeassistant/components/aseko_pool_live/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@milanmeu"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aseko_pool_live",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["aioaseko"],
  "requirements": ["aioaseko==1.0.0"]
--- a/homeassistant/components/asuswrt/manifest.json
+++ b/homeassistant/components/asuswrt/manifest.json
@@ -7,5 +7,5 @@
  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
-  "requirements": ["aioasuswrt==1.5.4", "asusrouter==1.21.3"]
+  "requirements": ["aioasuswrt==1.5.2", "asusrouter==1.21.3"]
 }
--- a/homeassistant/components/atag/manifest.json
+++ b/homeassistant/components/atag/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@MatsNL"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/atag",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["pyatag"],
  "requirements": ["pyatag==0.3.5.3"]
--- a/homeassistant/components/august/manifest.json
+++ b/homeassistant/components/august/manifest.json
@@ -27,7 +27,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/august",
-  "integration_type": "hub",
  "iot_class": "cloud_push",
  "loggers": ["pubnub", "yalexs"],
  "requirements": ["yalexs==9.2.0", "yalexs-ble==3.2.2"]
--- a/homeassistant/components/aurora/manifest.json
+++ b/homeassistant/components/aurora/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@djtimca"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aurora",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["auroranoaa"],
  "requirements": ["auroranoaa==0.0.5"]
--- a/homeassistant/components/aussie_broadband/manifest.json
+++ b/homeassistant/components/aussie_broadband/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@nickw444", "@Bre77"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aussie_broadband",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["aussiebb"],
  "requirements": ["pyaussiebb==0.1.5"]
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -128,6 +128,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
    "climate",
    "cover",
    "fan",
+    "input_boolean",
    "lawn_mower",
    "light",
    "media_player",
--- a/homeassistant/components/azure_data_explorer/manifest.json
+++ b/homeassistant/components/azure_data_explorer/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@kaareseras"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/azure_data_explorer",
-  "integration_type": "service",
  "iot_class": "cloud_push",
  "loggers": ["azure"],
  "requirements": ["azure-kusto-ingest==4.5.1", "azure-kusto-data[aio]==4.5.1"]
--- a/homeassistant/components/azure_devops/manifest.json
+++ b/homeassistant/components/azure_devops/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@timmo001"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/azure_devops",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["aioazuredevops"],
  "requirements": ["aioazuredevops==2.2.2"]
--- a/homeassistant/components/azure_event_hub/manifest.json
+++ b/homeassistant/components/azure_event_hub/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@eavanvalkenburg"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/azure_event_hub",
-  "integration_type": "service",
  "iot_class": "cloud_push",
  "loggers": ["azure"],
  "requirements": ["azure-eventhub==5.11.1"],
--- a/homeassistant/components/baf/manifest.json
+++ b/homeassistant/components/baf/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@bdraco", "@jfroy"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/baf",
-  "integration_type": "device",
  "iot_class": "local_push",
  "requirements": ["aiobafi6==0.9.0"],
  "zeroconf": [
--- a/homeassistant/components/balboa/manifest.json
+++ b/homeassistant/components/balboa/manifest.json
@@ -12,7 +12,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/balboa",
-  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["pybalboa"],
  "requirements": ["pybalboa==1.1.3"]
--- a/homeassistant/components/blebox/manifest.json
+++ b/homeassistant/components/blebox/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@bbx-a", "@swistakm"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/blebox",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["blebox_uniapi"],
  "requirements": ["blebox-uniapi==2.5.0"],
--- a/homeassistant/components/blink/manifest.json
+++ b/homeassistant/components/blink/manifest.json
@@ -1,7 +1,7 @@
 {
  "domain": "blink",
  "name": "Blink",
-  "codeowners": ["@fronzbot"],
+  "codeowners": ["@fronzbot", "@mkmer"],
  "config_flow": true,
  "dhcp": [
    {
@@ -18,8 +18,7 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/blink",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["blinkpy"],
-  "requirements": ["blinkpy==0.25.2"]
+  "requirements": ["blinkpy==0.25.1"]
 }
--- a/homeassistant/components/blue_current/manifest.json
+++ b/homeassistant/components/blue_current/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@gleeuwen", "@NickKoepr", "@jtodorova23"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/blue_current",
-  "integration_type": "hub",
  "iot_class": "cloud_push",
  "loggers": ["bluecurrent_api"],
  "requirements": ["bluecurrent-api==1.3.2"]
--- a/homeassistant/components/bluemaestro/manifest.json
+++ b/homeassistant/components/bluemaestro/manifest.json
@@ -11,7 +11,6 @@
  "config_flow": true,
  "dependencies": ["bluetooth_adapters"],
  "documentation": "https://www.home-assistant.io/integrations/bluemaestro",
-  "integration_type": "device",
  "iot_class": "local_push",
  "requirements": ["bluemaestro-ble==0.4.1"]
 }
--- a/homeassistant/components/bluesound/manifest.json
+++ b/homeassistant/components/bluesound/manifest.json
@@ -5,7 +5,6 @@
  "codeowners": ["@thrawnarn", "@LouisChrist"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/bluesound",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "requirements": ["pyblu==2.0.5"],
  "zeroconf": [
--- a/homeassistant/components/bmw_connected_drive/manifest.json
+++ b/homeassistant/components/bmw_connected_drive/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@gerard33", "@rikroe"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["bimmer_connected"],
  "requirements": ["bimmer-connected[china]==0.17.3"]
--- a/homeassistant/components/bond/manifest.json
+++ b/homeassistant/components/bond/manifest.json
@@ -14,7 +14,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/bond",
-  "integration_type": "hub",
  "iot_class": "local_push",
  "loggers": ["bond_async"],
  "requirements": ["bond-async==0.2.1"],
--- a/homeassistant/components/bosch_shc/manifest.json
+++ b/homeassistant/components/bosch_shc/manifest.json
@@ -5,7 +5,6 @@
  "codeowners": ["@tschamm"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/bosch_shc",
-  "integration_type": "hub",
  "iot_class": "local_push",
  "loggers": ["boschshcpy"],
  "requirements": ["boschshcpy==0.2.107"],
--- a/homeassistant/components/brottsplatskartan/manifest.json
+++ b/homeassistant/components/brottsplatskartan/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@gjohansson-ST"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/brottsplatskartan",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["brottsplatskartan"],
  "requirements": ["brottsplatskartan==1.0.5"]
--- a/homeassistant/components/brunt/manifest.json
+++ b/homeassistant/components/brunt/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@eavanvalkenburg"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/brunt",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["brunt"],
  "requirements": ["brunt==1.2.0"]
--- a/homeassistant/components/buienradar/manifest.json
+++ b/homeassistant/components/buienradar/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@mjj4791", "@ties", "@Robbie1221"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/buienradar",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["buienradar", "vincenty"],
  "requirements": ["buienradar==1.0.6"]
--- a/homeassistant/components/caldav/manifest.json
+++ b/homeassistant/components/caldav/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": [],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/caldav",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["caldav", "vobject"],
  "requirements": ["caldav==2.1.0", "icalendar==6.3.1", "vobject==0.9.9"]
--- a/homeassistant/components/canary/manifest.json
+++ b/homeassistant/components/canary/manifest.json
@@ -5,7 +5,6 @@
  "config_flow": true,
  "dependencies": ["ffmpeg"],
  "documentation": "https://www.home-assistant.io/integrations/canary",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["canary"],
  "requirements": ["py-canary==0.5.4"],
--- a/homeassistant/components/ccm15/manifest.json
+++ b/homeassistant/components/ccm15/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@ocalvo"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/ccm15",
-  "integration_type": "hub",
  "iot_class": "local_polling",
  "requirements": ["py_ccm15==0.1.2"]
 }
--- a/homeassistant/components/cert_expiry/manifest.json
+++ b/homeassistant/components/cert_expiry/manifest.json
@@ -4,6 +4,5 @@
  "codeowners": ["@jjlawren"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/cert_expiry",
-  "integration_type": "service",
  "iot_class": "cloud_polling"
 }
--- a/homeassistant/components/cloudflare/manifest.json
+++ b/homeassistant/components/cloudflare/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@ludeeus", "@ctalkington"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/cloudflare",
-  "integration_type": "service",
  "iot_class": "cloud_push",
  "loggers": ["pycfdns"],
  "requirements": ["pycfdns==3.0.0"],
--- a/homeassistant/components/coinbase/manifest.json
+++ b/homeassistant/components/coinbase/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@tombrien"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/coinbase",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["coinbase"],
  "requirements": ["coinbase-advanced-py==1.2.2"]
--- a/homeassistant/components/control4/manifest.json
+++ b/homeassistant/components/control4/manifest.json
@@ -1,10 +1,9 @@
 {
  "domain": "control4",
  "name": "Control4",
-  "codeowners": ["@lawtancool", "@davidrecordon"],
+  "codeowners": ["@lawtancool"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/control4",
-  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["pyControl4"],
  "requirements": ["pyControl4==1.5.0"],
--- a/homeassistant/components/daikin/manifest.json
+++ b/homeassistant/components/daikin/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@fredrike"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/daikin",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["pydaikin"],
  "requirements": ["pydaikin==2.17.1"],
--- a/homeassistant/components/datadog/manifest.json
+++ b/homeassistant/components/datadog/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": [],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/datadog",
-  "integration_type": "service",
  "iot_class": "local_push",
  "loggers": ["datadog"],
  "quality_scale": "legacy",
--- a/homeassistant/components/dexcom/manifest.json
+++ b/homeassistant/components/dexcom/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@gagebenne"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/dexcom",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["pydexcom"],
  "requirements": ["pydexcom==0.2.3"]
--- a/homeassistant/components/dnsip/manifest.json
+++ b/homeassistant/components/dnsip/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@gjohansson-ST"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/dnsip",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
-  "requirements": ["aiodns==3.6.1"]
+  "requirements": ["aiodns==3.6.0"]
 }
--- a/homeassistant/components/doorbird/manifest.json
+++ b/homeassistant/components/doorbird/manifest.json
@@ -5,7 +5,6 @@
  "config_flow": true,
  "dependencies": ["http", "repairs"],
  "documentation": "https://www.home-assistant.io/integrations/doorbird",
-  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["doorbirdpy"],
  "requirements": ["DoorBirdPy==3.0.11"],
--- a/homeassistant/components/drop_connect/manifest.json
+++ b/homeassistant/components/drop_connect/manifest.json
@@ -5,7 +5,6 @@
  "config_flow": true,
  "dependencies": ["mqtt"],
  "documentation": "https://www.home-assistant.io/integrations/drop_connect",
-  "integration_type": "hub",
  "iot_class": "local_push",
  "mqtt": ["drop_connect/discovery/#"],
  "requirements": ["dropmqttapi==1.0.3"]
--- a/homeassistant/components/droplet/manifest.json
+++ b/homeassistant/components/droplet/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@sarahseidman"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/droplet",
-  "integration_type": "device",
  "iot_class": "local_push",
  "quality_scale": "bronze",
  "requirements": ["pydroplet==2.3.4"],
--- a/homeassistant/components/dunehd/manifest.json
+++ b/homeassistant/components/dunehd/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": [],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/dunehd",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["pdunehd"],
  "requirements": ["pdunehd==1.3.2"]
--- a/homeassistant/components/duotecno/manifest.json
+++ b/homeassistant/components/duotecno/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@cereal2nd"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/duotecno",
-  "integration_type": "hub",
  "iot_class": "local_push",
  "loggers": ["pyduotecno", "pyduotecno-node", "pyduotecno-unit"],
  "requirements": ["pyDuotecno==2024.10.1"],
--- a/homeassistant/components/eafm/manifest.json
+++ b/homeassistant/components/eafm/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Jc2k"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/eafm",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["aioeafm"],
  "requirements": ["aioeafm==0.1.2"]
--- a/homeassistant/components/ecobee/manifest.json
+++ b/homeassistant/components/ecobee/manifest.json
@@ -7,7 +7,6 @@
  "homekit": {
    "models": ["EB", "ecobee*"]
  },
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["pyecobee"],
  "requirements": ["python-ecobee-api==0.3.2"],
--- a/homeassistant/components/ecoforest/manifest.json
+++ b/homeassistant/components/ecoforest/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@pjanuario"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/ecoforest",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["pyecoforest"],
  "requirements": ["pyecoforest==0.4.0"]
--- a/homeassistant/components/econet/manifest.json
+++ b/homeassistant/components/econet/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@w1ll1am23"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/econet",
-  "integration_type": "hub",
  "iot_class": "cloud_push",
  "loggers": ["paho_mqtt", "pyeconet"],
  "requirements": ["pyeconet==0.1.28"]
--- a/homeassistant/components/ekeybionyx/event.py
+++ b/homeassistant/components/ekeybionyx/event.py
@@ -1,7 +1,5 @@
 """Event platform for ekey bionyx integration."""

-from http import HTTPStatus
-
 from aiohttp.hdrs import METH_POST
 from aiohttp.web import Request, Response

@@ -54,18 +52,8 @@ class EkeyEvent(EventEntity):
        async def async_webhook_handler(
            hass: HomeAssistant, webhook_id: str, request: Request
        ) -> Response | None:
-            try:
-                payload = await request.json()
-            except ValueError:
-                return Response(status=HTTPStatus.BAD_REQUEST)
-            auth = payload.get("auth")
-
-            if auth is None:
-                return Response(status=HTTPStatus.BAD_REQUEST)
-            if auth != self._auth:
-                return Response(status=HTTPStatus.UNAUTHORIZED)
-
-            self._async_handle_event()
+            if (await request.json())["auth"] == self._auth:
+                self._async_handle_event()
            return None

        webhook_register(
--- a/homeassistant/components/ekeybionyx/manifest.json
+++ b/homeassistant/components/ekeybionyx/manifest.json
@@ -5,7 +5,6 @@
  "config_flow": true,
  "dependencies": ["application_credentials", "http"],
  "documentation": "https://www.home-assistant.io/integrations/ekeybionyx",
-  "integration_type": "hub",
  "iot_class": "local_push",
  "quality_scale": "bronze",
  "requirements": ["ekey-bionyxpy==1.0.0"]
--- a/homeassistant/components/electrasmart/manifest.json
+++ b/homeassistant/components/electrasmart/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@jafar-atili"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/electrasmart",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "requirements": ["pyElectra==1.2.4"]
 }
--- a/homeassistant/components/elkm1/manifest.json
+++ b/homeassistant/components/elkm1/manifest.json
@@ -13,7 +13,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/elkm1",
-  "integration_type": "hub",
  "iot_class": "local_push",
  "loggers": ["elkm1_lib"],
  "requirements": ["elkm1-lib==2.2.13"]
--- a/homeassistant/components/elvia/manifest.json
+++ b/homeassistant/components/elvia/manifest.json
@@ -5,7 +5,6 @@
  "config_flow": true,
  "dependencies": ["recorder"],
  "documentation": "https://www.home-assistant.io/integrations/elvia",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "requirements": ["elvia==0.1.0"]
 }
--- a/homeassistant/components/emoncms/manifest.json
+++ b/homeassistant/components/emoncms/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@borpin", "@alexandrecuer"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/emoncms",
-  "integration_type": "service",
  "iot_class": "local_polling",
  "requirements": ["pyemoncms==0.1.3"]
 }
--- a/homeassistant/components/emonitor/manifest.json
+++ b/homeassistant/components/emonitor/manifest.json
@@ -13,7 +13,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/emonitor",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["aioemonitor"],
  "requirements": ["aioemonitor==1.0.5"]
--- a/homeassistant/components/environment_canada/manifest.json
+++ b/homeassistant/components/environment_canada/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@gwww", "@michaeldavie"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/environment_canada",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["env_canada"],
  "requirements": ["env-canada==0.12.1"]
--- a/homeassistant/components/epson/manifest.json
+++ b/homeassistant/components/epson/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@pszafer"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/epson",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["epson_projector"],
  "requirements": ["epson-projector==0.6.0"]
--- a/homeassistant/components/escea/manifest.json
+++ b/homeassistant/components/escea/manifest.json
@@ -7,7 +7,6 @@
  "homekit": {
    "models": ["Escea"]
  },
-  "integration_type": "device",
  "iot_class": "local_push",
  "requirements": ["pescea==1.0.12"]
 }
--- a/homeassistant/components/evil_genius_labs/manifest.json
+++ b/homeassistant/components/evil_genius_labs/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": [],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/evil_genius_labs",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "requirements": ["pyevilgenius==2.0.0"]
 }
--- a/homeassistant/components/faa_delays/manifest.json
+++ b/homeassistant/components/faa_delays/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@ntilley905"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/faa_delays",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["faadelays"],
  "requirements": ["faadelays==2023.9.1"]
--- a/homeassistant/components/fing/manifest.json
+++ b/homeassistant/components/fing/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Lorenzo-Gasparini"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/fing",
-  "integration_type": "service",
  "iot_class": "local_polling",
  "quality_scale": "bronze",
  "requirements": ["fing_agent_api==1.0.3"]
--- a/homeassistant/components/firefly_iii/manifest.json
+++ b/homeassistant/components/firefly_iii/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@erwindouna"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/firefly_iii",
-  "integration_type": "service",
  "iot_class": "local_polling",
  "quality_scale": "bronze",
  "requirements": ["pyfirefly==0.1.8"]
--- a/homeassistant/components/firefly_iii/strings.json
+++ b/homeassistant/components/firefly_iii/strings.json
@@ -42,11 +42,11 @@
          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
        },
        "data_description": {
-          "api_key": "The API key for authenticating with Firefly III",
+          "api_key": "The API key for authenticating with Firefly",
          "url": "[%key:common::config_flow::data::url%]",
-          "verify_ssl": "Verify the SSL certificate of the Firefly III instance"
+          "verify_ssl": "Verify the SSL certificate of the Firefly instance"
        },
-        "description": "You can create an API key in the Firefly III UI. Go to **Options > Profile** and select the **OAuth** tab. Create a new personal access token and copy it (it will only display once)."
+        "description": "You can create an API key in the Firefly UI. Go to **Options > Profile** and select the **OAuth** tab. Create a new personal access token and copy it (it will only display once)."
      }
    }
  },
@@ -84,13 +84,13 @@
  },
  "exceptions": {
    "cannot_connect": {
-      "message": "An error occurred while trying to connect to the Firefly III instance: {error}"
+      "message": "An error occurred while trying to connect to the Firefly instance: {error}"
    },
    "invalid_auth": {
      "message": "An error occurred while trying to authenticate: {error}"
    },
    "timeout_connect": {
-      "message": "A timeout occurred while trying to connect to the Firefly III instance: {error}"
+      "message": "A timeout occurred while trying to connect to the Firefly instance: {error}"
    }
  }
 }
--- a/homeassistant/components/fireservicerota/manifest.json
+++ b/homeassistant/components/fireservicerota/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@cyberjunky"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/fireservicerota",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["pyfireservicerota"],
  "requirements": ["pyfireservicerota==0.0.46"]
--- a/homeassistant/components/fitbit/manifest.json
+++ b/homeassistant/components/fitbit/manifest.json
@@ -5,7 +5,6 @@
  "config_flow": true,
  "dependencies": ["application_credentials", "http"],
  "documentation": "https://www.home-assistant.io/integrations/fitbit",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["fitbit", "fitbit_web_api"],
  "requirements": ["fitbit==0.3.1", "fitbit-web-api==2.13.5"]
--- a/homeassistant/components/fivem/manifest.json
+++ b/homeassistant/components/fivem/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Sander0542"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/fivem",
-  "integration_type": "service",
  "iot_class": "local_polling",
  "requirements": ["fivem-api==0.1.2"]
 }
--- a/homeassistant/components/flipr/manifest.json
+++ b/homeassistant/components/flipr/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@cnico"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/flipr",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["flipr_api"],
  "requirements": ["flipr-api==1.6.1"]
--- a/homeassistant/components/flo/manifest.json
+++ b/homeassistant/components/flo/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@dmulcahey"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/flo",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["aioflo"],
  "requirements": ["aioflo==2021.11.0"]
--- a/homeassistant/components/flume/manifest.json
+++ b/homeassistant/components/flume/manifest.json
@@ -9,7 +9,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/flume",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["pyflume"],
  "requirements": ["PyFlume==0.6.5"]
--- a/homeassistant/components/foscam/manifest.json
+++ b/homeassistant/components/foscam/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@Foscam-wangzhengyu"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/foscam",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["libpyfoscamcgi"],
  "requirements": ["libpyfoscamcgi==0.0.9"]
--- a/homeassistant/components/freedompro/manifest.json
+++ b/homeassistant/components/freedompro/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@stefano055415"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/freedompro",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "loggers": ["pyfreedompro"],
  "requirements": ["pyfreedompro==1.1.0"]
--- a/homeassistant/components/fritzbox/manifest.json
+++ b/homeassistant/components/fritzbox/manifest.json
@@ -7,7 +7,7 @@
  "integration_type": "hub",
  "iot_class": "local_polling",
  "loggers": ["pyfritzhome"],
-  "requirements": ["pyfritzhome==0.6.18"],
+  "requirements": ["pyfritzhome==0.6.17"],
  "ssdp": [
    {
      "st": "urn:schemas-upnp-org:device:fritzbox:1"
--- a/homeassistant/components/frontier_silicon/manifest.json
+++ b/homeassistant/components/frontier_silicon/manifest.json
@@ -4,12 +4,7 @@
  "codeowners": ["@wlcrs"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/frontier_silicon",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "requirements": ["afsapi==0.2.7"],
-  "ssdp": [
-    {
-      "st": "urn:schemas-frontier-silicon-com:undok:fsapi:1"
-    }
-  ]
+  "ssdp": [{ "st": "urn:schemas-frontier-silicon-com:undok:fsapi:1" }]
 }
--- a/homeassistant/components/fujitsu_fglair/manifest.json
+++ b/homeassistant/components/fujitsu_fglair/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@crevetor"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/fujitsu_fglair",
-  "integration_type": "hub",
  "iot_class": "cloud_polling",
  "requirements": ["ayla-iot-unofficial==1.4.7"]
 }
--- a/homeassistant/components/fully_kiosk/manifest.json
+++ b/homeassistant/components/fully_kiosk/manifest.json
@@ -10,7 +10,6 @@
    }
  ],
  "documentation": "https://www.home-assistant.io/integrations/fully_kiosk",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "mqtt": ["fully/deviceInfo/+"],
  "quality_scale": "bronze",
--- a/homeassistant/components/garages_amsterdam/manifest.json
+++ b/homeassistant/components/garages_amsterdam/manifest.json
@@ -4,7 +4,6 @@
  "codeowners": ["@klaasnicolaas"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/garages_amsterdam",
-  "integration_type": "service",
  "iot_class": "cloud_polling",
  "requirements": ["odp-amsterdam==6.1.2"]
 }
--- a/homeassistant/components/gardena_bluetooth/manifest.json
+++ b/homeassistant/components/gardena_bluetooth/manifest.json
@@ -12,7 +12,6 @@
  "config_flow": true,
  "dependencies": ["bluetooth_adapters"],
  "documentation": "https://www.home-assistant.io/integrations/gardena_bluetooth",
-  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["bleak", "bleak_esphome", "gardena_bluetooth"],
  "requirements": ["gardena-bluetooth==1.6.0"]
--- a/homeassistant/components/generic/config_flow.py
+++ b/homeassistant/components/generic/config_flow.py
@@ -77,7 +77,6 @@ DEFAULT_DATA = {
    CONF_LIMIT_REFETCH_TO_URL_CHANGE: False,
    CONF_FRAMERATE: 2,
    CONF_VERIFY_SSL: True,
-    CONF_RTSP_TRANSPORT: "tcp",
 }

 SUPPORTED_IMAGE_TYPES = {"png", "jpeg", "gif", "svg+xml", "webp"}
--- a/Show More
+++ b/Show More