VladPolskiy/home-assistant-supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-08-15 21:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump voluptuous from 0.12.1 to 0.12.2 (#3147)

Browse Source
This commit is contained in:
Pascal Vizeli
2021-09-27 08:28:34 +02:00
committed by GitHub
parent c9d3f65cc8
commit 4416b6524e
23 changed files with 66 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
supervisor/validate.py
View File

@ -54,10 +54,14 @@ sha256 = vol.Match(r"^[0-9a-f]{64}$")
token = vol.Match(r"^[0-9a-f]{32,256}$")
def version_tag(value: Union[str, None, int, float]) -> Optional[AwesomeVersion]:
def version_tag(
value: Union[str, None, int, float, AwesomeVersion]
) -> Optional[AwesomeVersion]:
"""Validate main version handling."""
if value is None:
return None
if isinstance(value, AwesomeVersion):
return value
return AwesomeVersion(value)
@ -98,7 +102,7 @@ repositories = vol.All([validate_repository], vol.Unique())
docker_port = vol.All(str, vol.Match(r"^\d+(?:/tcp|/udp)?$"))
docker_ports = vol.Schema({docker_port: vol.Maybe(network_port)})
docker_ports_description = vol.Schema({docker_port: vol.Coerce(str)})
docker_ports_description = vol.Schema({docker_port: str})
# pylint: disable=no-value-for-parameter
@ -137,7 +141,7 @@ SCHEMA_UPDATER_CONFIG = vol.Schema(
SCHEMA_SUPERVISOR_CONFIG = vol.Schema(
{
vol.Optional(ATTR_TIMEZONE): validate_timezone,
vol.Optional(ATTR_LAST_BOOT): vol.Coerce(str),
vol.Optional(ATTR_LAST_BOOT): str,
vol.Optional(
ATTR_VERSION, default=AwesomeVersion(SUPERVISOR_VERSION)
): version_tag,
@ -178,9 +182,7 @@ SCHEMA_INGRESS_CONFIG = vol.Schema(
vol.Required(ATTR_SESSION, default=dict): vol.Schema(
{token: vol.Coerce(float)}
),
vol.Required(ATTR_PORTS, default=dict): vol.Schema(
{vol.Coerce(str): network_port}
),
vol.Required(ATTR_PORTS, default=dict): vol.Schema({str: network_port}),
},
extra=vol.REMOVE_EXTRA,
)