Skip to content

Commit 8a0c732

Browse files
committed
Merge tag 'refs/tags/2025.06.1'
2 parents fb89a65 + b030879 commit 8a0c732

File tree

126 files changed

+1180
-716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+1180
-716
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Bug Report Form
22
description: Report an issue related to the Home Assistant Supervisor.
3-
labels: bug
43
body:
54
- type: markdown
65
attributes:

.github/workflows/builder.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ jobs:
131131

132132
- name: Install Cosign
133133
if: needs.init.outputs.publish == 'true'
134-
uses: sigstore/cosign-installer@v3.8.2
134+
uses: sigstore/cosign-installer@v3.9.0
135135
with:
136-
cosign-release: "v2.4.0"
136+
cosign-release: "v2.4.3"
137137

138138
- name: Install dirhash and calc hash
139139
if: needs.init.outputs.publish == 'true'

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,9 @@ jobs:
299299
with:
300300
python-version: ${{ needs.prepare.outputs.python-version }}
301301
- name: Install Cosign
302-
uses: sigstore/cosign-installer@v3.8.2
302+
uses: sigstore/cosign-installer@v3.9.0
303303
with:
304-
cosign-release: "v2.4.0"
304+
cosign-release: "v2.4.3"
305305
- name: Restore Python virtual environment
306306
id: cache-venv
307307
uses: actions/cache@v4.2.3

.github/workflows/sentry.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Check out code from GitHub
1313
uses: actions/checkout@v4.2.2
1414
- name: Sentry Release
15-
uses: getsentry/action-release@v3.1.1
15+
uses: getsentry/action-release@v3.1.2
1616
env:
1717
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
1818
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}

build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cosign:
1212
base_identity: https://github.com/home-assistant/docker-base/.*
1313
identity: https://github.com/home-assistant/supervisor/.*
1414
args:
15-
COSIGN_VERSION: 2.4.0
15+
COSIGN_VERSION: 2.4.3
1616
labels:
1717
io.hass.type: supervisor
1818
org.opencontainers.image.title: Home Assistant Supervisor

requirements.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
aiodns==3.4.0
2-
aiohttp==3.12.4
1+
aiodns==3.5.0
2+
aiohttp==3.12.13
33
atomicwrites-homeassistant==1.4.1
44
attrs==25.3.0
5-
awesomeversion==24.6.0
5+
awesomeversion==25.5.0
66
blockbuster==1.5.24
77
brotli==1.1.0
88
ciso8601==2.3.2
99
colorlog==6.9.0
1010
cpe==1.3.1
11-
cryptography==45.0.3
11+
cryptography==45.0.4
1212
debugpy==1.8.14
1313
deepmerge==2.0
1414
dirhash==0.5.0
@@ -21,9 +21,9 @@ orjson==3.10.18
2121
pulsectl==24.12.0
2222
pyudev==0.24.3
2323
PyYAML==6.0.2
24-
requests==2.32.3
24+
requests==2.32.4
2525
securetar==2025.2.1
26-
sentry-sdk==2.29.1
26+
sentry-sdk==2.30.0
2727
setuptools==80.9.0
2828
voluptuous==0.15.2
2929
dbus-fast==2.44.1

requirements_tests.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
astroid==3.3.10
2-
coverage==7.8.2
2+
coverage==7.9.1
33
pre-commit==4.2.0
44
pylint==3.3.7
55
pytest-aiohttp==1.1.0
66
pytest-asyncio==0.25.2
7-
pytest-cov==6.1.1
7+
pytest-cov==6.2.1
88
pytest-timeout==2.4.0
9-
pytest==8.3.5
10-
ruff==0.11.11
9+
pytest==8.4.1
10+
ruff==0.12.0
1111
time-machine==2.16.0
12-
urllib3==2.4.0
12+
urllib3==2.5.0

supervisor/addons/manager.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ def get(self, addon_slug: str, local_only: bool = False) -> AnyAddon | None:
6767
return self.store.get(addon_slug)
6868
return None
6969

70+
def get_local_only(self, addon_slug: str) -> Addon | None:
71+
"""Return an installed add-on from slug."""
72+
return self.local.get(addon_slug)
73+
7074
def from_token(self, token: str) -> Addon | None:
7175
"""Return an add-on from Supervisor token."""
7276
for addon in self.installed:

supervisor/api/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from aiohttp import hdrs, web
1010

11-
from ..const import AddonState
11+
from ..const import SUPERVISOR_DOCKER_NAME, AddonState
1212
from ..coresys import CoreSys, CoreSysAttributes
1313
from ..exceptions import APIAddonNotInstalled, HostNotSupportedError
1414
from ..utils.sentry import async_capture_exception
@@ -426,7 +426,7 @@ def _register_supervisor(self) -> None:
426426
async def get_supervisor_logs(*args, **kwargs):
427427
try:
428428
return await self._api_host.advanced_logs_handler(
429-
*args, identifier="hassio_supervisor", **kwargs
429+
*args, identifier=SUPERVISOR_DOCKER_NAME, **kwargs
430430
)
431431
except Exception as err: # pylint: disable=broad-exception-caught
432432
# Supervisor logs are critical, so catch everything, log the exception
@@ -789,6 +789,7 @@ def _register_docker(self) -> None:
789789
self.webapp.add_routes(
790790
[
791791
web.get("/docker/info", api_docker.info),
792+
web.post("/docker/options", api_docker.options),
792793
web.get("/docker/registries", api_docker.registries),
793794
web.post("/docker/registries", api_docker.create_registry),
794795
web.delete("/docker/registries/{hostname}", api_docker.remove_registry),

supervisor/api/const.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ class DetectBlockingIO(StrEnum):
8787

8888
OFF = "off"
8989
ON = "on"
90-
ON_AT_STARTUP = "on_at_startup"
90+
ON_AT_STARTUP = "on-at-startup"

0 commit comments

Comments
 (0)