diff --git a/homeassistant/components/discovery/manifest.json b/homeassistant/components/discovery/manifest.json index 76e4ff701c5..b2065edfc54 100644 --- a/homeassistant/components/discovery/manifest.json +++ b/homeassistant/components/discovery/manifest.json @@ -3,6 +3,7 @@ "name": "Discovery", "documentation": "https://www.home-assistant.io/integrations/discovery", "requirements": ["netdisco==2.6.0"], + "after_dependencies": ["zeroconf"], "codeowners": [], "quality_scale": "internal" } diff --git a/homeassistant/components/dyson/manifest.json b/homeassistant/components/dyson/manifest.json index 60800963842..35a76180e2e 100644 --- a/homeassistant/components/dyson/manifest.json +++ b/homeassistant/components/dyson/manifest.json @@ -3,5 +3,6 @@ "name": "Dyson", "documentation": "https://www.home-assistant.io/integrations/dyson", "requirements": ["libpurecool==0.6.1"], + "after_dependencies": ["zeroconf"], "codeowners": ["@etheralm"] } diff --git a/homeassistant/components/soundtouch/manifest.json b/homeassistant/components/soundtouch/manifest.json index c9cc4f32734..58bdab1a2d7 100644 --- a/homeassistant/components/soundtouch/manifest.json +++ b/homeassistant/components/soundtouch/manifest.json @@ -3,5 +3,6 @@ "name": "Bose Soundtouch", "documentation": "https://www.home-assistant.io/integrations/soundtouch", "requirements": ["libsoundtouch==0.8"], + "after_dependencies": ["zeroconf"], "codeowners": [] } diff --git a/homeassistant/components/ssdp/manifest.json b/homeassistant/components/ssdp/manifest.json index a2683346b63..85b91ff005c 100644 --- a/homeassistant/components/ssdp/manifest.json +++ b/homeassistant/components/ssdp/manifest.json @@ -3,5 +3,6 @@ "name": "Simple Service Discovery Protocol (SSDP)", "documentation": "https://www.home-assistant.io/integrations/ssdp", "requirements": ["defusedxml==0.6.0", "netdisco==2.6.0"], + "after_dependencies": ["zeroconf"], "codeowners": [] } diff --git a/homeassistant/components/zeroconf/manifest.json b/homeassistant/components/zeroconf/manifest.json index e28594d5598..c5e0efe1fe3 100644 --- a/homeassistant/components/zeroconf/manifest.json +++ b/homeassistant/components/zeroconf/manifest.json @@ -2,7 +2,7 @@ "domain": "zeroconf", "name": "Zero-configuration networking (zeroconf)", "documentation": "https://www.home-assistant.io/integrations/zeroconf", - "requirements": ["zeroconf==0.26.3"], + "requirements": ["zeroconf==0.27.1"], "dependencies": ["api"], "codeowners": ["@robbiet480", "@Kane610"], "quality_scale": "internal" diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt index 9f8c7c03f0c..479d60bc47b 100644 --- a/homeassistant/package_constraints.txt +++ b/homeassistant/package_constraints.txt @@ -25,7 +25,7 @@ ruamel.yaml==0.15.100 sqlalchemy==1.3.17 voluptuous-serialize==2.3.0 voluptuous==0.11.7 -zeroconf==0.26.3 +zeroconf==0.27.1 pycryptodome>=3.6.6 diff --git a/requirements_all.txt b/requirements_all.txt index 40933e6a44f..4d2ff698d40 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -2242,7 +2242,7 @@ youtube_dl==2020.05.29 zengge==0.2 # homeassistant.components.zeroconf -zeroconf==0.26.3 +zeroconf==0.27.1 # homeassistant.components.zha zha-quirks==0.0.39 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index f02f9b8b080..b1d215806ae 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -918,7 +918,7 @@ xmltodict==0.12.0 ya_ma==0.3.8 # homeassistant.components.zeroconf -zeroconf==0.26.3 +zeroconf==0.27.1 # homeassistant.components.zha zha-quirks==0.0.39 diff --git a/tests/components/zeroconf/test_init.py b/tests/components/zeroconf/test_init.py index 74069fa5faa..45b1d9b1171 100644 --- a/tests/components/zeroconf/test_init.py +++ b/tests/components/zeroconf/test_init.py @@ -40,7 +40,7 @@ def get_service_info_mock(service_type, name): return ServiceInfo( service_type, name, - address=b"\n\x00\x00\x14", + addresses=[b"\n\x00\x00\x14"], port=80, weight=0, priority=0, @@ -56,7 +56,7 @@ def get_homekit_info_mock(model, pairing_status): return ServiceInfo( service_type, name, - address=b"\n\x00\x00\x14", + addresses=[b"\n\x00\x00\x14"], port=80, weight=0, priority=0, diff --git a/tests/test_requirements.py b/tests/test_requirements.py index f98485e8006..20202f91e89 100644 --- a/tests/test_requirements.py +++ b/tests/test_requirements.py @@ -221,8 +221,10 @@ async def test_discovery_requirements_ssdp(hass): ) as mock_process: await async_get_integration_with_requirements(hass, "ssdp_comp") - assert len(mock_process.mock_calls) == 1 + assert len(mock_process.mock_calls) == 3 assert mock_process.mock_calls[0][1][2] == ssdp.requirements + # Ensure zeroconf is a dep for ssdp + assert mock_process.mock_calls[1][1][1] == "zeroconf" @pytest.mark.parametrize(