Merge branch 'refs/heads/2025.02.1'

# Conflicts:
#	.github/workflows/sentry.yaml
#	build.yaml

Author: al-one

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": "Supervisor dev",
-  "image": "ghcr.io/home-assistant/devcontainer:supervisor",
+  "image": "ghcr.io/home-assistant/devcontainer:2-supervisor",
   "containerEnv": {
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
@@ -44,5 +44,8 @@
       }
     }
   },
-  "mounts": ["type=volume,target=/var/lib/docker"]
+  "mounts": [
+    "type=volume,target=/var/lib/docker",
+    "type=volume,target=/mnt/supervisor"
+  ]
 }

.github/workflows/builder.yml

@@ -33,7 +33,7 @@ on:
       - setup.py
 
 env:
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.13"
   BUILD_NAME: supervisor
   BUILD_TYPE: supervisor
 
@@ -125,13 +125,13 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.publish == 'true'
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Install Cosign
         if: needs.init.outputs.publish == 'true'
-        uses: sigstore/cosign-installer@v3.7.0
+        uses: sigstore/cosign-installer@v3.8.0
         with:
           cosign-release: "v2.4.0"
 

.github/workflows/ci.yaml

@@ -8,7 +8,7 @@ on:
   pull_request: ~
 
 env:
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.13"
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
 
 concurrency:
@@ -28,7 +28,7 @@ jobs:
         uses: actions/[email protected]
       - name: Set up Python
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
@@ -69,7 +69,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         id: python
         with:
           python-version: ${{ needs.prepare.outputs.python-version }}
@@ -112,7 +112,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         id: python
         with:
           python-version: ${{ needs.prepare.outputs.python-version }}
@@ -170,7 +170,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         id: python
         with:
           python-version: ${{ needs.prepare.outputs.python-version }}
@@ -214,7 +214,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         id: python
         with:
           python-version: ${{ needs.prepare.outputs.python-version }}
@@ -258,7 +258,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         id: python
         with:
           python-version: ${{ needs.prepare.outputs.python-version }}
@@ -294,12 +294,12 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         id: python
         with:
           python-version: ${{ needs.prepare.outputs.python-version }}
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.7.0
+        uses: sigstore/cosign-installer@v3.8.0
         with:
           cosign-release: "v2.4.0"
       - name: Restore Python virtual environment
@@ -353,7 +353,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Set up Python ${{ needs.prepare.outputs.python-version }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.4.0
         id: python
         with:
           python-version: ${{ needs.prepare.outputs.python-version }}
@@ -378,4 +378,4 @@ jobs:
           coverage report
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.1.2
+        uses: codecov/codecov-action@v5.3.1

.github/workflows/sentry.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/[email protected]
       - name: Sentry Release
-        uses: getsentry/action-release@v1.9.0
+        uses: getsentry/action-release@v1.10.4
         if: ${{ secrets.SENTRY_ORG != '' }}
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.0.0
+      - uses: actions/stale@v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30

.ha-frontend-version

@@ -1 +1 @@
-20241127.8
+20250205.0

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.7
+    rev: v0.9.1
     hooks:
       - id: ruff
         args:
           - --fix
       - id: ruff-format
         files: ^((supervisor|tests)/.+)?[^/]+\.py$
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-executables-have-shebangs
         stages: [manual]

build.yaml

@@ -1,10 +1,10 @@
 image: ghcr.nju.edu.cn/home-assistant/{arch}-hassio-supervisor
 build_from:
-  aarch64: ghcr.nju.edu.cn/home-assistant/aarch64-base-python:3.12-alpine3.20
-  armhf: ghcr.nju.edu.cn/home-assistant/armhf-base-python:3.12-alpine3.20
-  armv7: ghcr.nju.edu.cn/home-assistant/armv7-base-python:3.12-alpine3.20
-  amd64: ghcr.nju.edu.cn/home-assistant/amd64-base-python:3.12-alpine3.20
-  i386: ghcr.nju.edu.cn/home-assistant/i386-base-python:3.12-alpine3.20
+  aarch64: ghcr.nju.edu.cn/home-assistant/aarch64-base-python:3.13-alpine3.21
+  armhf: ghcr.nju.edu.cn/home-assistant/armhf-base-python:3.13-alpine3.21
+  armv7: ghcr.nju.edu.cn/home-assistant/armv7-base-python:3.13-alpine3.21
+  amd64: ghcr.nju.edu.cn/home-assistant/amd64-base-python:3.13-alpine3.21
+  i386: ghcr.nju.edu.cn/home-assistant/i386-base-python:3.13-alpine3.21
 codenotary:
   signer: [email protected]
   base_image: [email protected]

pyproject.toml

@@ -12,7 +12,7 @@ authors = [
     { name = "The Home Assistant Authors", email = "[email protected]" },
 ]
 keywords = ["docker", "home-assistant", "api"]
-requires-python = ">=3.12.0"
+requires-python = ">=3.13.0"
 
 [project.urls]
 "Homepage" = "https://www.home-assistant.io/"
@@ -31,7 +31,7 @@ include-package-data = true
 include = ["supervisor*"]
 
 [tool.pylint.MAIN]
-py-version = "3.12"
+py-version = "3.13"
 # Use a conservative default here; 2 should speed up most setups and not hurt
 # any too bad. Override on command line as appropriate.
 jobs = 2
@@ -147,7 +147,7 @@ disable = [
     # "pointless-statement", # B018, ruff catches new occurrences, needs more work
     "raise-missing-from", # TRY200
     # "redefined-builtin", # A001, ruff is way more stricter, needs work
-    "try-except-raise",               # TRY302
+    "try-except-raise",               # TRY203
     "unused-argument",                # ARG001, we don't use it
     "unused-format-string-argument",  #F507
     "unused-format-string-key",       # F504
@@ -223,6 +223,7 @@ testpaths = ["tests"]
 norecursedirs = [".git"]
 log_format = "%(asctime)s.%(msecs)03d %(levelname)-8s %(threadName)s %(name)s:%(filename)s:%(lineno)s %(message)s"
 log_date_format = "%Y-%m-%d %H:%M:%S"
+asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "auto"
 filterwarnings = [
     "error",
@@ -289,7 +290,7 @@ lint.select = [
     "T20",     # flake8-print
     "TID251",  # Banned imports
     "TRY004",  # Prefer TypeError exception for invalid type
-    "TRY302",  # Remove exception handler; error is immediately re-raised
+    "TRY203",  # Remove exception handler; error is immediately re-raised
     "UP",      # pyupgrade
     "W",       # pycodestyle
 ]

requirements.txt

@@ -1,7 +1,7 @@
 aiodns==3.2.0
-aiohttp==3.11.11
+aiohttp==3.11.12
 atomicwrites-homeassistant==1.4.1
-attrs==24.3.0
+attrs==25.1.0
 awesomeversion==24.6.0
 brotli==1.1.0
 ciso8601==2.3.2
@@ -20,10 +20,10 @@ pulsectl==24.12.0
 pyudev==0.24.3
 PyYAML==6.0.2
 requests==2.32.3
-securetar==2025.1.3
+securetar==2025.1.4
 sentry-sdk==2.20.0
 setuptools==75.8.0
 voluptuous==0.15.2
-dbus-fast==2.28.0
+dbus-fast==2.33.0
 typing_extensions==4.12.2
 zlib-fast==0.2.0

requirements_tests.txt

@@ -1,13 +1,13 @@
 astroid==3.3.8
-coverage==7.6.10
-pre-commit==4.0.1
-pylint==3.3.3
-pytest-aiohttp==1.0.5
-pytest-asyncio==0.23.6
+coverage==7.6.12
+pre-commit==4.1.0
+pylint==3.3.4
+pytest-aiohttp==1.1.0
+pytest-asyncio==0.25.2
 pytest-cov==6.0.0
 pytest-timeout==2.3.1
 pytest==8.3.4
-ruff==0.9.2
+ruff==0.9.6
 time-machine==2.16.0
 typing_extensions==4.12.2
 urllib3==2.3.0

setup.py

@@ -19,7 +19,7 @@ def _get_supervisor_version():
     for line in CONSTANTS.split("/n"):
         if match := RE_SUPERVISOR_VERSION.match(line):
             return match.group(1)
-    return "99.9.9dev"
+    return "9999.09.9.dev9999"
 
 
 setup(