Remove deprecated yaml import for gpsd (#123725)

This commit is contained in:
G Johansson 2024-08-12 21:31:42 +02:00 committed by GitHub
parent 05c4b1a6a9
commit d8b13c8c02
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 82 deletions

View File

@ -39,10 +39,6 @@ class GPSDConfigFlow(ConfigFlow, domain=DOMAIN):
else:
return True
async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
"""Import a config entry from configuration.yaml."""
return await self.async_step_user(import_data)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:

View File

@ -7,35 +7,17 @@ from dataclasses import dataclass
import logging
from typing import Any
from gps3.agps3threaded import (
GPSD_PORT as DEFAULT_PORT,
HOST as DEFAULT_HOST,
AGPS3mechanism,
)
import voluptuous as vol
from gps3.agps3threaded import AGPS3mechanism
from homeassistant.components.sensor import (
PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
SensorDeviceClass,
SensorEntity,
SensorEntityDescription,
)
from homeassistant.config_entries import SOURCE_IMPORT
from homeassistant.const import (
ATTR_LATITUDE,
ATTR_LONGITUDE,
ATTR_MODE,
CONF_HOST,
CONF_NAME,
CONF_PORT,
EntityCategory,
)
from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
import homeassistant.helpers.config_validation as cv
from homeassistant.const import ATTR_LATITUDE, ATTR_LONGITUDE, ATTR_MODE, EntityCategory
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from . import GPSDConfigEntry
from .const import DOMAIN
@ -71,14 +53,6 @@ SENSOR_TYPES: tuple[GpsdSensorDescription, ...] = (
),
)
PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
{
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_HOST, default=DEFAULT_HOST): cv.string,
vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
}
)
async def async_setup_entry(
hass: HomeAssistant,
@ -98,34 +72,6 @@ async def async_setup_entry(
)
async def async_setup_platform(
hass: HomeAssistant,
config: ConfigType,
async_add_entities: AddEntitiesCallback,
discovery_info: DiscoveryInfoType | None = None,
) -> None:
"""Initialize gpsd import from config."""
async_create_issue(
hass,
HOMEASSISTANT_DOMAIN,
f"deprecated_yaml_{DOMAIN}",
is_fixable=False,
breaks_in_ha_version="2024.9.0",
severity=IssueSeverity.WARNING,
translation_key="deprecated_yaml",
translation_placeholders={
"domain": DOMAIN,
"integration_title": "GPSD",
},
)
hass.async_create_task(
hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_IMPORT}, data=config
)
)
class GpsdSensor(SensorEntity):
"""Representation of a GPS receiver available via GPSD."""

View File

@ -6,7 +6,7 @@ from gps3.agps3threaded import GPSD_PORT as DEFAULT_PORT
from homeassistant import config_entries
from homeassistant.components.gpsd.const import DOMAIN
from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
from homeassistant.const import CONF_HOST, CONF_PORT
from homeassistant.core import HomeAssistant
from homeassistant.data_entry_flow import FlowResultType
@ -52,23 +52,3 @@ async def test_connection_error(hass: HomeAssistant) -> None:
assert result["type"] is FlowResultType.ABORT
assert result["reason"] == "cannot_connect"
async def test_import(hass: HomeAssistant) -> None:
"""Test import step."""
with patch("homeassistant.components.gpsd.config_flow.socket") as mock_socket:
mock_connect = mock_socket.return_value.connect
mock_connect.return_value = None
result = await hass.config_entries.flow.async_init(
DOMAIN,
context={"source": config_entries.SOURCE_IMPORT},
data={CONF_HOST: HOST, CONF_PORT: 1234, CONF_NAME: "MyGPS"},
)
assert result["type"] is FlowResultType.CREATE_ENTRY
assert result["title"] == "MyGPS"
assert result["data"] == {
CONF_HOST: HOST,
CONF_NAME: "MyGPS",
CONF_PORT: 1234,
}