Skip to content

Fix missing rich.markup.escape import in tools/ci.py#69408

Open
dwoz wants to merge 1 commit into
3006.xfrom
dwoz/fix/tools-ci-escape-import-3006x
Open

Fix missing rich.markup.escape import in tools/ci.py#69408
dwoz wants to merge 1 commit into
3006.xfrom
dwoz/fix/tools-ci-escape-import-3006x

Conversation

@dwoz

@dwoz dwoz commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Commit fffeee3f235 ("Run pre-commit twice in dependabot sync") added escape(...) calls at 9 locations in tools/ci.py but did not add the import. Since that change merged via a58c4dcd602 on 2026-06-09, every push to 3006.x and every PR targeting 3006.x fails at Prepare Workflow Run with:

NameError: name 'escape' is not defined

Importing escape from rich.markup unblocks CI for every open 3006.x PR.

3007.x already has this exact import at tools/ci.py:21.

This same fix is also bundled inside #69403 as commit 4ca3e1bd7a7, but #69403 has other in-progress changes including a regression in salt/states/file.py::test_managed. Landing the escape fix standalone here unblocks the CI fleet without waiting on #69403's other concerns.

Commit fffeee3 ("Run pre-commit twice in dependabot sync") added
escape(...) calls at 9 locations in tools/ci.py but did not add the
import. Since that change merged via a58c4dc on 2026-06-09, every
push to 3006.x and every PR targeting 3006.x fails at "Prepare Workflow
Run" with NameError: name 'escape' is not defined.

Importing escape from rich.markup unblocks CI for every 3006.x PR.

3007.x already has this import at tools/ci.py:21.
@dwoz

dwoz commented Jun 18, 2026

Copy link
Copy Markdown
Contributor Author

This PR is redundant. The missing from rich.markup import escape import was added to 3006.x in commit 4ca3e1b on 2026-06-09. The remaining changes here are only single-to-double quote cleanups. Recommend closing without merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

test:full Run the full test suite

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant