Remove unnecessary truthiness checks for integration.manifest (#82319)
This commit is contained in:
parent
f887aeedfe
commit
69d519418e
13 changed files with 6 additions and 55 deletions
|
@ -262,10 +262,6 @@ def gather_requirements_from_manifests(
|
|||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest:
|
||||
errors.append(f"The manifest for integration {domain} is invalid.")
|
||||
continue
|
||||
|
||||
if integration.disabled:
|
||||
continue
|
||||
|
||||
|
|
|
@ -10,12 +10,7 @@ def generate_and_validate(integrations: dict[str, Integration]) -> str:
|
|||
match_list = []
|
||||
|
||||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest or not integration.config_flow:
|
||||
continue
|
||||
|
||||
match_types = integration.manifest.get("bluetooth", [])
|
||||
match_types = integrations[domain].manifest.get("bluetooth", [])
|
||||
|
||||
if not match_types:
|
||||
continue
|
||||
|
|
|
@ -70,8 +70,7 @@ def _generate_and_validate(integrations: dict[str, Integration], config: Config)
|
|||
|
||||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest or not integration.config_flow:
|
||||
if not integration.config_flow:
|
||||
continue
|
||||
|
||||
_validate_integration(config, integration)
|
||||
|
|
|
@ -249,9 +249,6 @@ def validate(integrations: dict[str, Integration], config: Config) -> None:
|
|||
"""Handle dependencies for integrations."""
|
||||
# check for non-existing dependencies
|
||||
for integration in integrations.values():
|
||||
if not integration.manifest:
|
||||
continue
|
||||
|
||||
validate_dependencies(integrations, integration)
|
||||
|
||||
if config.specific_integrations:
|
||||
|
|
|
@ -10,12 +10,7 @@ def generate_and_validate(integrations: dict[str, Integration]) -> str:
|
|||
match_list = []
|
||||
|
||||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest or not integration.config_flow:
|
||||
continue
|
||||
|
||||
match_types = integration.manifest.get("dhcp", [])
|
||||
match_types = integrations[domain].manifest.get("dhcp", [])
|
||||
|
||||
if not match_types:
|
||||
continue
|
||||
|
|
|
@ -25,7 +25,4 @@ def validate(integrations: dict[str, Integration], config: Config) -> None:
|
|||
return
|
||||
|
||||
for integration in integrations.values():
|
||||
if not integration.manifest:
|
||||
continue
|
||||
|
||||
validate_json_files(integration)
|
||||
|
|
|
@ -299,9 +299,6 @@ def validate_version(integration: Integration) -> None:
|
|||
|
||||
def validate_manifest(integration: Integration, core_components_dir: Path) -> None:
|
||||
"""Validate manifest."""
|
||||
if not integration.manifest:
|
||||
return
|
||||
|
||||
try:
|
||||
if integration.core:
|
||||
manifest_schema(integration.manifest)
|
||||
|
|
|
@ -13,12 +13,7 @@ def generate_and_validate(integrations: dict[str, Integration]) -> str:
|
|||
data = defaultdict(list)
|
||||
|
||||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest or not integration.config_flow:
|
||||
continue
|
||||
|
||||
mqtt = integration.manifest.get("mqtt")
|
||||
mqtt = integrations[domain].manifest.get("mqtt")
|
||||
|
||||
if not mqtt:
|
||||
continue
|
||||
|
|
|
@ -67,9 +67,6 @@ def validate(integrations: dict[str, Integration], config: Config) -> None:
|
|||
disable_tqdm = bool(config.specific_integrations or os.environ.get("CI"))
|
||||
|
||||
for integration in tqdm(integrations.values(), disable=disable_tqdm):
|
||||
if not integration.manifest:
|
||||
continue
|
||||
|
||||
validate_requirements(integration)
|
||||
|
||||
|
||||
|
|
|
@ -97,7 +97,4 @@ def validate(integrations: dict[str, Integration], config: Config) -> None:
|
|||
"""Handle dependencies for integrations."""
|
||||
# check services.yaml is cool
|
||||
for integration in integrations.values():
|
||||
if not integration.manifest:
|
||||
continue
|
||||
|
||||
validate_services(integration)
|
||||
|
|
|
@ -13,12 +13,7 @@ def generate_and_validate(integrations: dict[str, Integration]) -> str:
|
|||
data = defaultdict(list)
|
||||
|
||||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest or not integration.config_flow:
|
||||
continue
|
||||
|
||||
ssdp = integration.manifest.get("ssdp")
|
||||
ssdp = integrations[domain].manifest.get("ssdp")
|
||||
|
||||
if not ssdp:
|
||||
continue
|
||||
|
|
|
@ -10,12 +10,7 @@ def generate_and_validate(integrations: dict[str, Integration]) -> str:
|
|||
match_list = []
|
||||
|
||||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest or not integration.config_flow:
|
||||
continue
|
||||
|
||||
match_types = integration.manifest.get("usb", [])
|
||||
match_types = integrations[domain].manifest.get("usb", [])
|
||||
|
||||
if not match_types:
|
||||
continue
|
||||
|
|
|
@ -16,10 +16,6 @@ def generate_and_validate(integrations: dict[str, Integration]) -> str:
|
|||
|
||||
for domain in sorted(integrations):
|
||||
integration = integrations[domain]
|
||||
|
||||
if not integration.manifest or not integration.config_flow:
|
||||
continue
|
||||
|
||||
service_types = integration.manifest.get("zeroconf", [])
|
||||
homekit = integration.manifest.get("homekit", {})
|
||||
homekit_models = homekit.get("models", [])
|
||||
|
|
Loading…
Add table
Reference in a new issue