From 28fa6f541f99981ffba0369a1cb0da885fa76766 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 23 May 2023 07:18:26 -0500
Subject: [PATCH] Bump ifaddr to 0.2.0 (#93377)
---
homeassistant/components/network/manifest.json | 2 +-
homeassistant/components/network/models.py | 2 +-
homeassistant/components/network/util.py | 3 +++
homeassistant/package_constraints.txt | 2 +-
pyproject.toml | 2 +-
requirements.txt | 2 +-
requirements_all.txt | 2 +-
requirements_test_all.txt | 2 +-
8 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/homeassistant/components/network/manifest.json b/homeassistant/components/network/manifest.json
index f7e0bea2422..a76da88914d 100644
--- a/homeassistant/components/network/manifest.json
+++ b/homeassistant/components/network/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "system",
"iot_class": "local_push",
"quality_scale": "internal",
- "requirements": ["ifaddr==0.1.7"]
+ "requirements": ["ifaddr==0.2.0"]
}
diff --git a/homeassistant/components/network/models.py b/homeassistant/components/network/models.py
index d3fbc824489..4428578f8f9 100644
--- a/homeassistant/components/network/models.py
+++ b/homeassistant/components/network/models.py
@@ -24,7 +24,7 @@ class Adapter(TypedDict):
"""Configured network adapters."""
name: str
- index: int
+ index: int | None
enabled: bool
auto: bool
default: bool
diff --git a/homeassistant/components/network/util.py b/homeassistant/components/network/util.py
index 6f204b05397..2fb0690684c 100644
--- a/homeassistant/components/network/util.py
+++ b/homeassistant/components/network/util.py
@@ -97,6 +97,7 @@ def _ifaddr_adapter_to_ha(
ip_addr = ip_address(ip_config.ip[0])
ip_v6s.append(_ip_v6_from_adapter(ip_config))
else:
+ assert not isinstance(ip_config.ip, tuple)
ip_addr = ip_address(ip_config.ip)
ip_v4s.append(_ip_v4_from_adapter(ip_config))
@@ -117,6 +118,7 @@ def _ifaddr_adapter_to_ha(
def _ip_v6_from_adapter(ip_config: ifaddr.IP) -> IPv6ConfiguredAddress:
+ assert isinstance(ip_config.ip, tuple)
return {
"address": ip_config.ip[0],
"flowinfo": ip_config.ip[1],
@@ -126,6 +128,7 @@ def _ip_v6_from_adapter(ip_config: ifaddr.IP) -> IPv6ConfiguredAddress:
def _ip_v4_from_adapter(ip_config: ifaddr.IP) -> IPv4ConfiguredAddress:
+ assert not isinstance(ip_config.ip, tuple)
return {
"address": ip_config.ip,
"network_prefix": ip_config.network_prefix,
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 9f0e6e79d9b..a13a8f84790 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -28,7 +28,7 @@ home-assistant-bluetooth==1.10.0
home-assistant-frontend==20230503.3
home-assistant-intents==2023.4.26
httpx==0.24.0
-ifaddr==0.1.7
+ifaddr==0.2.0
janus==1.0.0
jinja2==3.1.2
lru-dict==1.1.8
diff --git a/pyproject.toml b/pyproject.toml
index 1e69404f4cb..1bda10f0677 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,7 @@ dependencies = [
# httpcore, anyio, and h11 in gen_requirements_all
"httpx==0.24.0",
"home-assistant-bluetooth==1.10.0",
- "ifaddr==0.1.7",
+ "ifaddr==0.2.0",
"jinja2==3.1.2",
"lru-dict==1.1.8",
"PyJWT==2.7.0",
diff --git a/requirements.txt b/requirements.txt
index 12533b51847..ca8bd263159 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ certifi>=2021.5.30
ciso8601==2.3.0
httpx==0.24.0
home-assistant-bluetooth==1.10.0
-ifaddr==0.1.7
+ifaddr==0.2.0
jinja2==3.1.2
lru-dict==1.1.8
PyJWT==2.7.0
diff --git a/requirements_all.txt b/requirements_all.txt
index 28ac5cc662d..1c7e3e96618 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -965,7 +965,7 @@ ical==4.5.1
icmplib==3.0
# homeassistant.components.network
-ifaddr==0.1.7
+ifaddr==0.2.0
# homeassistant.components.iglo
iglo==1.2.7
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index b21e7dca4f9..cf4f88351a3 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -745,7 +745,7 @@ ical==4.5.1
icmplib==3.0
# homeassistant.components.network
-ifaddr==0.1.7
+ifaddr==0.2.0
# homeassistant.components.influxdb
influxdb-client==1.24.0
--
GitLab