Skip to content

Upgrade zeroconf to 0.27.1 #36277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 10 commits into from
Jun 5, 2020
Merged

Upgrade zeroconf to 0.27.1 #36277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
20d7557
Upgrade zeroconf to 0.27
bdraco May 29, 2020
a12f16e
update tests
bdraco May 30, 2020
84754e4
bump version
bdraco Jun 5, 2020
331964b
Anything that loads netdisco needs zeroconf updated first
bdraco Jun 5, 2020
67cd181
homekit and cast as well
bdraco Jun 5, 2020
7861fed
fix more places that load zeroconf too soon
bdraco Jun 5, 2020
2e2f147
switch to after_dependencies
bdraco Jun 5, 2020
0110bc1
remove after_dep from integration that already have a zeroconf line
bdraco Jun 5, 2020
524158a
vizio also has a zeroconf line
bdraco Jun 5, 2020
5ca4478
update test for ssdp
bdraco Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions homeassistant/components/discovery/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
1 change: 1 addition & 0 deletions homeassistant/components/dyson/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "Dyson",
"documentation": "https://www.home-assistant.io/integrations/dyson",
"requirements": ["libpurecool==0.6.1"],
"after_dependencies": ["zeroconf"],
"codeowners": ["@etheralm"]
}
1 change: 1 addition & 0 deletions homeassistant/components/soundtouch/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"name": "Bose Soundtouch",
"documentation": "https://www.home-assistant.io/integrations/soundtouch",
"requirements": ["libsoundtouch==0.8"],
"after_dependencies": ["zeroconf"],
"codeowners": []
}
1 change: 1 addition & 0 deletions homeassistant/components/ssdp/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
}
2 changes: 1 addition & 1 deletion homeassistant/components/zeroconf/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/package_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
bdraco marked this conversation as resolved.

pycryptodome>=3.6.6

Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,7 +2239,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
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/components/zeroconf/test_init.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -56,7 +56,7 @@ def mock_homekit_info(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,
Expand Down
4 changes: 3 additions & 1 deletion tests/test_requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down