jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-16 17:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump PyISY to 3.1.13, check portal for network buttons (#87650)

Browse Source
This commit is contained in:
shbatm 2023-02-07 13:03:27 -06:00 committed by GitHub
parent 589ff54e63
commit 096f6eb554
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
homeassistant/components/isy994/__init__.py
View File

@ -7,6 +7,7 @@ from urllib.parse import urlparse
from aiohttp import CookieJar from aiohttp import CookieJar
import async_timeout import async_timeout
from pyisy import ISY, ISYConnectionError, ISYInvalidAuthError, ISYResponseParseError from pyisy import ISY, ISYConnectionError, ISYInvalidAuthError, ISYResponseParseError
from pyisy.constants import CONFIG_NETWORKING, CONFIG_PORTAL
import voluptuous as vol import voluptuous as vol
from homeassistant import config_entries from homeassistant import config_entries
@ -43,7 +44,6 @@ from .const import (
ISY_CONF_FIRMWARE, ISY_CONF_FIRMWARE,
ISY_CONF_MODEL, ISY_CONF_MODEL,
ISY_CONF_NAME, ISY_CONF_NAME,
ISY_CONF_NETWORKING,
MANUFACTURER, MANUFACTURER,
PLATFORMS, PLATFORMS,
SCHEME_HTTP, SCHEME_HTTP,
@ -220,9 +220,11 @@ async def async_setup_entry(
numbers = isy_data.variables[Platform.NUMBER] numbers = isy_data.variables[Platform.NUMBER]
for vtype, _, vid in isy.variables.children: for vtype, _, vid in isy.variables.children:
numbers.append(isy.variables[vtype][vid]) numbers.append(isy.variables[vtype][vid])
if isy.conf[ISY_CONF_NETWORKING]: if (
isy.conf[CONFIG_NETWORKING] or isy.conf[CONFIG_PORTAL]
) and isy.networking.nobjs:
isy_data.devices[CONF_NETWORK] = _create_service_device_info( isy_data.devices[CONF_NETWORK] = _create_service_device_info(
isy, name=ISY_CONF_NETWORKING, unique_id=CONF_NETWORK isy, name=CONFIG_NETWORKING, unique_id=CONF_NETWORK
) )
for resource in isy.networking.nobjs: for resource in isy.networking.nobjs:
isy_data.net_resources.append(resource) isy_data.net_resources.append(resource)

1
homeassistant/components/isy994/const.py
View File

@ -118,7 +118,6 @@ SUPPORTED_BIN_SENS_CLASSES = ["moisture", "opening", "motion", "climate"]
# (they can turn off, and report their state) # (they can turn off, and report their state)
ISY_GROUP_PLATFORM = Platform.SWITCH ISY_GROUP_PLATFORM = Platform.SWITCH
ISY_CONF_NETWORKING = "Networking Module"
ISY_CONF_UUID = "uuid" ISY_CONF_UUID = "uuid"
ISY_CONF_NAME = "name" ISY_CONF_NAME = "name"
ISY_CONF_MODEL = "model" ISY_CONF_MODEL = "model"

2
homeassistant/components/isy994/manifest.json
View File

@ -3,7 +3,7 @@
"name": "Universal Devices ISY/IoX", "name": "Universal Devices ISY/IoX",
"integration_type": "hub", "integration_type": "hub",
"documentation": "https://www.home-assistant.io/integrations/isy994", "documentation": "https://www.home-assistant.io/integrations/isy994",
"requirements": ["pyisy==3.1.11"], "requirements": ["pyisy==3.1.13"],
"codeowners": ["@bdraco", "@shbatm"], "codeowners": ["@bdraco", "@shbatm"],
"config_flow": true, "config_flow": true,
"ssdp": [ "ssdp": [

4
homeassistant/components/isy994/services.py
View File

@ -23,7 +23,7 @@ import homeassistant.helpers.entity_registry as er
from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
from homeassistant.helpers.service import entity_service_call from homeassistant.helpers.service import entity_service_call
from .const import _LOGGER, CONF_NETWORK, DOMAIN, ISY_CONF_NAME, ISY_CONF_NETWORKING from .const import _LOGGER, CONF_NETWORK, DOMAIN, ISY_CONF_NAME
from .util import _async_cleanup_registry_entries from .util import _async_cleanup_registry_entries
# Common Services for All Platforms: # Common Services for All Platforms:
@ -233,7 +233,7 @@ def async_setup_services(hass: HomeAssistant) -> None: # noqa: C901
isy = isy_data.root isy = isy_data.root
if isy_name and isy_name != isy.conf[ISY_CONF_NAME]: if isy_name and isy_name != isy.conf[ISY_CONF_NAME]:
continue continue
if isy.networking is None or not isy.conf[ISY_CONF_NETWORKING]: if isy.networking is None:
continue continue
command = None command = None
if address: if address:

2
requirements_all.txt
View File

@ -1705,7 +1705,7 @@ pyirishrail==0.0.2
pyiss==1.0.1 pyiss==1.0.1
# homeassistant.components.isy994 # homeassistant.components.isy994
pyisy==3.1.11 pyisy==3.1.13
# homeassistant.components.itach # homeassistant.components.itach
pyitachip2ir==0.0.7 pyitachip2ir==0.0.7

2
requirements_test_all.txt
View File

@ -1224,7 +1224,7 @@ pyiqvia==2022.04.0
pyiss==1.0.1 pyiss==1.0.1
# homeassistant.components.isy994 # homeassistant.components.isy994
pyisy==3.1.11 pyisy==3.1.13
# homeassistant.components.kaleidescape # homeassistant.components.kaleidescape
pykaleidescape==1.0.1 pykaleidescape==1.0.1