From 8dd42cb7a0d378ff22b3df88200914ed67de577c Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Fri, 13 Feb 2026 08:12:19 +0100
Subject: [PATCH 1/2] Fix getting Supervisor IP address in testing (#6564)

* Fix getting Supervisor IP address in testing

Newer Docker versions (probably newer than 29.x) do not have a global
IPAddress attribute under .NetworkSettings anymore. There is a network
specific map under Networks. For our case the hassio has the relevant
IP address. This network specific maps already existed before, hence
the new inspect format works for old as well as new Docker versions.

While at it, also adjust the test fixture.

* Actively wait for hassio IPAddress to become valid
---
 .github/workflows/builder.yml       |  6 +++++-
 tests/fixtures/container_attrs.json | 16 +---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index fb4425c3e..5f6a9804f 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -296,7 +296,11 @@ jobs:
       - &wait_for_supervisor
         name: Wait for Supervisor to come up
         run: |
-          SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' hassio_supervisor)
+          until SUPERVISOR=$(docker inspect --format='{{.NetworkSettings.Networks.hassio.IPAddress}}' hassio_supervisor 2>/dev/null) && \
+                [ -n "$SUPERVISOR" ] && [ "$SUPERVISOR" != "<no value>" ]; do
+            echo "Waiting for network configuration..."
+            sleep 1
+          done
           echo "Waiting for Supervisor API at http://${SUPERVISOR}/supervisor/ping"
           timeout=300
           elapsed=0
diff --git a/tests/fixtures/container_attrs.json b/tests/fixtures/container_attrs.json
index 38ccf5b1d..483f762f3 100644
--- a/tests/fixtures/container_attrs.json
+++ b/tests/fixtures/container_attrs.json
@@ -210,28 +210,14 @@
     }
   },
   "NetworkSettings": {
-    "Bridge": "",
     "SandboxID": "067cd11a63f96d227dcc0f01d3e4f5053c368021becd0b4b2da4f301cfda3d29",
-    "HairpinMode": false,
-    "LinkLocalIPv6Address": "",
-    "LinkLocalIPv6PrefixLen": 0,
+    "SandboxKey": "/var/run/docker/netns/067cd11a63f9",
     "Ports": {
       "1883/tcp": [
         { "HostIp": "0.0.0.0", "HostPort": "1883" },
         { "HostIp": "::", "HostPort": "1883" }
       ]
     },
-    "SandboxKey": "/var/run/docker/netns/067cd11a63f9",
-    "SecondaryIPAddresses": null,
-    "SecondaryIPv6Addresses": null,
-    "EndpointID": "",
-    "Gateway": "",
-    "GlobalIPv6Address": "",
-    "GlobalIPv6PrefixLen": 0,
-    "IPAddress": "",
-    "IPPrefixLen": 0,
-    "IPv6Gateway": "",
-    "MacAddress": "",
     "Networks": {
       "hassio": {
         "IPAMConfig": null,

From 0cce2dad3cb5c23faed266e22bd9173fc58e0fc7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Feb 2026 08:59:59 +0100
Subject: [PATCH 2/2] Bump ruff from 0.15.0 to 0.15.1 (#6565)

Bumps [ruff](https://github.com/astral-sh/ruff) from 0.15.0 to 0.15.1.
- [Release notes](https://github.com/astral-sh/ruff/releases)
- [Changelog](https://github.com/astral-sh/ruff/blob/main/CHANGELOG.md)
- [Commits](https://github.com/astral-sh/ruff/compare/0.15.0...0.15.1)

---
updated-dependencies:
- dependency-name: ruff
  dependency-version: 0.15.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_tests.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_tests.txt b/requirements_tests.txt
index 05faf748d..b63f0ccee 100644
--- a/requirements_tests.txt
+++ b/requirements_tests.txt
@@ -8,7 +8,7 @@ pytest-asyncio==1.3.0
 pytest-cov==7.0.0
 pytest-timeout==2.4.0
 pytest==9.0.2
-ruff==0.15.0
+ruff==0.15.1
 time-machine==3.2.0
 types-docker==7.1.0.20260109
 types-pyyaml==6.0.12.20250915