evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make hassfest strictly typed (#82091)

Browse source
This commit is contained in:
Aarni Koskela 2022-11-23 20:05:31 +02:00 • committed by GitHub
parent 0b5357de44
commit 97b40b5f49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 132 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

19
script/hassfest/requirements.py
View file

@ -8,6 +8,7 @@ import os
import re
import subprocess
import sys
from typing import Any
from awesomeversion import AwesomeVersion, AwesomeVersionStrategy
from stdlib_list import stdlib_list
@ -53,7 +54,7 @@ IGNORE_VIOLATIONS = {
}
def validate(integrations: dict[str, Integration], config: Config):
def validate(integrations: dict[str, Integration], config: Config) -> None:
"""Handle requirements for integrations."""
# Check if we are doing format-only validation.
if not config.requirements:
@ -63,7 +64,7 @@ def validate(integrations: dict[str, Integration], config: Config):
# check for incompatible requirements
disable_tqdm = config.specific_integrations or os.environ.get("CI", False)
disable_tqdm = bool(config.specific_integrations or os.environ.get("CI"))
for integration in tqdm(integrations.values(), disable=disable_tqdm):
if not integration.manifest:
@ -87,7 +88,13 @@ def validate_requirements_format(integration: Integration) -> bool:
)
continue
pkg, sep, version = PACKAGE_REGEX.match(req).groups()
if not (match := PACKAGE_REGEX.match(req)):
integration.add_error(
"requirements",
f'Requirement "{req}" does not match package regex pattern',
)
continue
pkg, sep, version = match.groups()
if integration.core and sep != "==":
integration.add_error(
@ -115,7 +122,7 @@ def validate_requirements_format(integration: Integration) -> bool:
return len(integration.errors) == start_errors
def validate_requirements(integration: Integration):
def validate_requirements(integration: Integration) -> None:
"""Validate requirements."""
if not validate_requirements_format(integration):
return
@ -167,7 +174,7 @@ def validate_requirements(integration: Integration):
@cache
def get_pipdeptree():
def get_pipdeptree() -> dict[str, dict[str, Any]]:
"""Get pipdeptree output. Cached on first invocation.
{
@ -254,7 +261,7 @@ def install_requirements(integration: Integration, requirements: set[str]) -> bo
if normalized and "==" in requirement_arg:
ver = requirement_arg.split("==")[-1]
item = deptree.get(normalized)
is_installed = item and item["installed_version"] == ver
is_installed = bool(item and item["installed_version"] == ver)
if not is_installed:
try: