From 69d519418e5b835d1d1645b0888205007be8cb13 Mon Sep 17 00:00:00 2001 From: Aarni Koskela Date: Mon, 28 Nov 2022 16:33:14 +0200 Subject: [PATCH] Remove unnecessary truthiness checks for integration.manifest (#82319) --- script/gen_requirements_all.py | 4 ---- script/hassfest/bluetooth.py | 7 +------ script/hassfest/config_flow.py | 3 +-- script/hassfest/dependencies.py | 3 --- script/hassfest/dhcp.py | 7 +------ script/hassfest/json.py | 3 --- script/hassfest/manifest.py | 3 --- script/hassfest/mqtt.py | 7 +------ script/hassfest/requirements.py | 3 --- script/hassfest/services.py | 3 --- script/hassfest/ssdp.py | 7 +------ script/hassfest/usb.py | 7 +------ script/hassfest/zeroconf.py | 4 ---- 13 files changed, 6 insertions(+), 55 deletions(-) diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index ea77a99d2a..6d547ab9fe 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -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 diff --git a/script/hassfest/bluetooth.py b/script/hassfest/bluetooth.py index a4b2ffc8cb..295bcac1d1 100644 --- a/script/hassfest/bluetooth.py +++ b/script/hassfest/bluetooth.py @@ -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 diff --git a/script/hassfest/config_flow.py b/script/hassfest/config_flow.py index 2c3988cc48..e37075c5f7 100644 --- a/script/hassfest/config_flow.py +++ b/script/hassfest/config_flow.py @@ -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) diff --git a/script/hassfest/dependencies.py b/script/hassfest/dependencies.py index fae628270a..fd2b340aa3 100644 --- a/script/hassfest/dependencies.py +++ b/script/hassfest/dependencies.py @@ -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: diff --git a/script/hassfest/dhcp.py b/script/hassfest/dhcp.py index c143f5940c..882e39f300 100644 --- a/script/hassfest/dhcp.py +++ b/script/hassfest/dhcp.py @@ -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 diff --git a/script/hassfest/json.py b/script/hassfest/json.py index f0eae9f415..5e3d05f78d 100644 --- a/script/hassfest/json.py +++ b/script/hassfest/json.py @@ -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) diff --git a/script/hassfest/manifest.py b/script/hassfest/manifest.py index ecf0464833..3c1f90a67d 100644 --- a/script/hassfest/manifest.py +++ b/script/hassfest/manifest.py @@ -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) diff --git a/script/hassfest/mqtt.py b/script/hassfest/mqtt.py index d83cb95391..2619e22911 100644 --- a/script/hassfest/mqtt.py +++ b/script/hassfest/mqtt.py @@ -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 diff --git a/script/hassfest/requirements.py b/script/hassfest/requirements.py index 74fed8b7c7..27dd0654dc 100644 --- a/script/hassfest/requirements.py +++ b/script/hassfest/requirements.py @@ -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) diff --git a/script/hassfest/services.py b/script/hassfest/services.py index f7070d2dc5..d9351b8037 100644 --- a/script/hassfest/services.py +++ b/script/hassfest/services.py @@ -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) diff --git a/script/hassfest/ssdp.py b/script/hassfest/ssdp.py index aebead6e97..de548ee299 100644 --- a/script/hassfest/ssdp.py +++ b/script/hassfest/ssdp.py @@ -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 diff --git a/script/hassfest/usb.py b/script/hassfest/usb.py index 5420957e20..c5e3148f7b 100644 --- a/script/hassfest/usb.py +++ b/script/hassfest/usb.py @@ -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 diff --git a/script/hassfest/zeroconf.py b/script/hassfest/zeroconf.py index 7f8687bded..76a7be45c3 100644 --- a/script/hassfest/zeroconf.py +++ b/script/hassfest/zeroconf.py @@ -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", [])