diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index be73c22b77d..5a5172f513f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -360,7 +360,7 @@ jobs: - name: Run ruff run: | . venv/bin/activate - pre-commit run --hook-stage manual ruff --all-files --show-diff-on-failure + pre-commit run --hook-stage manual ruff-check --all-files --show-diff-on-failure env: RUFF_OUTPUT_FORMAT: github diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 42e05a869c3..060429cf66a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,8 +1,8 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.11.0 + rev: v0.11.12 hooks: - - id: ruff + - id: ruff-check args: - --fix - id: ruff-format diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 09c1d374299..50bb89daf38 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -45,7 +45,7 @@ { "label": "Ruff", "type": "shell", - "command": "pre-commit run ruff --all-files", + "command": "pre-commit run ruff-check --all-files", "group": { "kind": "test", "isDefault": true diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt index ff86915bbf3..c14c40de31f 100644 --- a/requirements_test_pre_commit.txt +++ b/requirements_test_pre_commit.txt @@ -1,5 +1,5 @@ # Automatically generated from .pre-commit-config.yaml by gen_requirements_all.py, do not edit codespell==2.4.1 -ruff==0.11.0 +ruff==0.11.12 yamllint==1.35.1 diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py index 572e57b999e..f4c2ee8da6a 100755 --- a/script/gen_requirements_all.py +++ b/script/gen_requirements_all.py @@ -249,6 +249,10 @@ GENERATED_MESSAGE = ( f"# Automatically generated by {Path(__file__).name}, do not edit\n\n" ) +MAP_HOOK_ID_TO_PACKAGE = { + "ruff-check": "ruff", +} + IGNORE_PRE_COMMIT_HOOK_ID = ( "check-executables-have-shebangs", "check-json", @@ -523,7 +527,8 @@ def requirements_pre_commit_output() -> str: rev: str = repo["rev"] for hook in repo["hooks"]: if hook["id"] not in IGNORE_PRE_COMMIT_HOOK_ID: - reqs.append(f"{hook['id']}=={rev.lstrip('v')}") + pkg = MAP_HOOK_ID_TO_PACKAGE.get(hook["id"]) or hook["id"] + reqs.append(f"{pkg}=={rev.lstrip('v')}") reqs.extend(x for x in hook.get("additional_dependencies", ())) output = [ f"# Automatically generated " diff --git a/script/hassfest/docker/Dockerfile b/script/hassfest/docker/Dockerfile index 08260f3b9a2..d4ecb6ffec3 100644 --- a/script/hassfest/docker/Dockerfile +++ b/script/hassfest/docker/Dockerfile @@ -24,7 +24,7 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.7.1,source=/uv,target=/bin/uv \ --no-cache \ -c /usr/src/homeassistant/homeassistant/package_constraints.txt \ -r /usr/src/homeassistant/requirements.txt \ - stdlib-list==0.10.0 pipdeptree==2.26.1 tqdm==4.67.1 ruff==0.11.0 \ + stdlib-list==0.10.0 pipdeptree==2.26.1 tqdm==4.67.1 ruff==0.11.12 \ PyTurboJPEG==1.8.0 go2rtc-client==0.1.3b0 ha-ffmpeg==3.2.2 hassil==2.2.3 home-assistant-intents==2025.5.28 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2 LABEL "name"="hassfest" diff --git a/script/lint b/script/lint index daafedb2297..26b6db705f1 100755 --- a/script/lint +++ b/script/lint @@ -15,7 +15,7 @@ printf "%s\n" $files echo "==============" echo "LINT with ruff" echo "==============" -pre-commit run ruff --files $files +pre-commit run ruff-check --files $files echo "================" echo "LINT with pylint" echo "================"