Update MarkupSafe and Relenv#69137
Merged
Merged
Conversation
twangboy
force-pushed
the
fix/dependabot/3006.x
branch
from
53b6063 to
dbe42e2
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Bumps MarkupSafe to 2.1.5
Bumps relenv to 0.22.11
Why Salt stays on MarkupSafe 2.1.5 (2.x)
We ship salt-ssh “thin” mode, which bundles Salt and selected pure-Python dependencies from the Salt filesystem onto remote hosts and runs salt-call using whatever Python those hosts expose (python3, python3.N, etc.). Thin targets are not limited to the interpreter versions we embed in modern Salt onedir builds.
We still care about compatibility where python3 is Python 3.6 or 3.7, including CI coverage (salt-ci-containers/ssh-minion) and widely deployed platforms whose default python3 lags newer minors (for example Amazon Linux 2).
MarkupSafe 3.x includes syntax (positional-only / in function definitions) that requires Python 3.8+. Packing MarkupSafe 3 into our thin py3/ payload causes salt-call on older interpreters to fail at import time with SyntaxError, before Salt runs user code.
Staying on MarkupSafe 2.1.5 keeps thin-mode viable on those interpreters while preserving behavior our integration tests explicitly exercise.
From an advisory standpoint, we monitor MarkupSafe like any dependency; pins should remain MarkupSafe>=2.1.5,<3 until we adopt a strategy that reflects MarkupSafe 3’s Python ≥ 3.8 baseline across all supported thin-mode targets.
We will revisit MarkupSafe 3 when we either raise and clearly document minimum thin-target Python, ship a maintained compatibility story (ssh_ext_alternatives, dual payloads, etc.), or narrow supported configurations accordingly.
Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes