Skip to content

Commit

Permalink
Remove group as a dependency from entity integrations (home-assistant…
Browse files Browse the repository at this point in the history
…#32870)

* remove group dependency

* Update device sun light trigger

* Add zone dep back to device tracker
  • Loading branch information
balloob authored Mar 16, 2020
1 parent 682fcec commit 3972383
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 16 deletions.
3 changes: 2 additions & 1 deletion homeassistant/components/automation/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"name": "Automation",
"documentation": "https://www.home-assistant.io/integrations/automation",
"requirements": [],
"dependencies": ["device_automation", "group", "webhook"],
"dependencies": [],
"after_dependencies": ["device_automation", "webhook"],
"codeowners": ["@home-assistant/core"],
"quality_scale": "internal"
}
2 changes: 1 addition & 1 deletion homeassistant/components/cover/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Cover",
"documentation": "https://www.home-assistant.io/integrations/cover",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": ["@home-assistant/core"],
"quality_scale": "internal"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"name": "Presence-based Lights",
"documentation": "https://www.home-assistant.io/integrations/device_sun_light_trigger",
"requirements": [],
"dependencies": ["device_tracker", "group", "light", "person"],
"dependencies": [],
"after_dependencies": ["device_tracker", "group", "light", "person"],
"codeowners": [],
"quality_scale": "internal"
}
3 changes: 2 additions & 1 deletion homeassistant/components/device_tracker/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"name": "Device Tracker",
"documentation": "https://www.home-assistant.io/integrations/device_tracker",
"requirements": [],
"dependencies": ["group", "zone"],
"dependencies": ["zone"],
"after_dependencies": [],
"codeowners": [],
"quality_scale": "internal"
}
2 changes: 1 addition & 1 deletion homeassistant/components/fan/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Fan",
"documentation": "https://www.home-assistant.io/integrations/fan",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": [],
"quality_scale": "internal"
}
2 changes: 1 addition & 1 deletion homeassistant/components/light/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Light",
"documentation": "https://www.home-assistant.io/integrations/light",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": [],
"quality_scale": "internal"
}
2 changes: 1 addition & 1 deletion homeassistant/components/lock/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Lock",
"documentation": "https://www.home-assistant.io/integrations/lock",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": [],
"quality_scale": "internal"
}
2 changes: 1 addition & 1 deletion homeassistant/components/plant/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Plant Monitor",
"documentation": "https://www.home-assistant.io/integrations/plant",
"requirements": [],
"dependencies": ["group", "zone"],
"dependencies": [],
"after_dependencies": ["recorder"],
"codeowners": ["@ChristianKuehnel"],
"quality_scale": "internal"
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/remote/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "Remote",
"documentation": "https://www.home-assistant.io/integrations/remote",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": []
}
2 changes: 1 addition & 1 deletion homeassistant/components/script/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Scripts",
"documentation": "https://www.home-assistant.io/integrations/script",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": ["@home-assistant/core"],
"quality_scale": "internal"
}
2 changes: 1 addition & 1 deletion homeassistant/components/switch/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Switch",
"documentation": "https://www.home-assistant.io/integrations/switch",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": [],
"quality_scale": "internal"
}
2 changes: 1 addition & 1 deletion homeassistant/components/vacuum/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"name": "Vacuum",
"documentation": "https://www.home-assistant.io/integrations/vacuum",
"requirements": [],
"dependencies": ["group"],
"dependencies": [],
"codeowners": []
}
4 changes: 2 additions & 2 deletions script/hassfest/dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def calc_allowed_references(integration: Integration) -> Set[str]:
"""Return a set of allowed references."""
allowed_references = (
ALLOWED_USED_COMPONENTS
| set(integration.manifest["dependencies"])
| set(integration.manifest.get("dependencies", []))
| set(integration.manifest.get("after_dependencies", []))
)

Expand Down Expand Up @@ -250,7 +250,7 @@ def validate(integrations: Dict[str, Integration], config):
validate_dependencies(integrations, integration)

# check that all referenced dependencies exist
for dep in integration.manifest["dependencies"]:
for dep in integration.manifest.get("dependencies", []):
if dep not in integrations:
integration.add_error(
"dependencies", f"Dependency {dep} does not exist"
Expand Down
4 changes: 2 additions & 2 deletions script/hassfest/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ def documentation_url(value: str) -> str:
vol.Url(), documentation_url # pylint: disable=no-value-for-parameter
),
vol.Optional("quality_scale"): vol.In(SUPPORTED_QUALITY_SCALES),
vol.Required("requirements"): [str],
vol.Required("dependencies"): [str],
vol.Optional("requirements"): [str],
vol.Optional("dependencies"): [str],
vol.Optional("after_dependencies"): [str],
vol.Required("codeowners"): [str],
vol.Optional("logo"): vol.Url(), # pylint: disable=no-value-for-parameter
Expand Down

0 comments on commit 3972383

Please sign in to comment.