Skip to content

Update MarkupSafe and Relenv #69137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dwoz merged 4 commits into from
May 14, 2026
Merged

Update MarkupSafe and Relenv #69137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d5ca7b
Update MarkupSafe to 3.0.3
twangboy May 12, 2026
12a0a6d
Update relenv to 0.22.11
twangboy May 12, 2026
f175f49
Update mercurial in ci to 7.1.2+
twangboy May 14, 2026
4e32946
Pin MarkupSafe to <3.0.0
twangboy May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -458,7 +458,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "onedir"
Expand All @@ -475,7 +475,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "src"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -522,7 +522,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "onedir"
Expand All @@ -543,7 +543,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "src"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -507,7 +507,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "onedir"
Expand All @@ -524,7 +524,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "src"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -482,7 +482,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "onedir"
Expand All @@ -504,7 +504,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.8"
relenv-version: "0.22.11"
python-version: "3.10.20"
ci-python-version: "3.14"
source: "src"
Expand Down
2 changes: 1 addition & 1 deletion cicd/shared-gh-workflows-context.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
nox_version: "2022.8.7"
python_version: "3.10.20"
relenv_version: "0.22.8"
relenv_version: "0.22.11"
release_branches:
- "3006.x"
- "3007.x"
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/darwin.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pygit2>=1.10.1
yamllint
mercurial
mercurial>=7.1.2
hglib
gitpython>=3.1.46
2 changes: 1 addition & 1 deletion requirements/static/ci/freebsd.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# FreeBSD static CI requirements

yamllint
mercurial
mercurial>=7.1.2
hglib
2 changes: 1 addition & 1 deletion requirements/static/ci/linux.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ansible>=13.4.0; python_version >= '3.12'
twilio>=9.10.3
python-telegram-bot>=13.7
yamllint
mercurial
mercurial>=7.1.2
hglib
redis-py-cluster
python-consul
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ looseversion==1.3.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/changelog.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.10/linux.txt
# jinja2
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ mako==1.2.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.10/linux.txt
# -c requirements/static/pkg/py3.10/linux.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,14 +239,14 @@ lxml==4.9.2
# xmldiff
mako==1.2.4
# via -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/pkg/py3.10/darwin.txt
# -r requirements/base.txt
# jinja2
# mako
# werkzeug
mercurial==6.4.4
mercurial==7.2.2
# via -r requirements/static/ci/darwin.in
mock==5.1.0
# via -r requirements/pytest.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ markdown-it-py==2.2.0
# via
# mdit-py-plugins
# myst-docutils
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,14 @@ lxml==6.1.0
# xmldiff
mako==1.2.4
# via -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/pkg/py3.10/freebsd.txt
# -r requirements/base.txt
# jinja2
# mako
# werkzeug
mercurial==6.4.4
mercurial==7.2.2
# via -r requirements/static/ci/freebsd.in
mock==5.1.0
# via -r requirements/pytest.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ mako==1.2.4
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.10/linux.txt
# -c requirements/static/pkg/py3.10/linux.txt
Expand All @@ -368,7 +368,7 @@ markupsafe==2.1.3
# werkzeug
mccabe==0.6.1
# via pylint
mercurial==6.4.4
mercurial==7.2.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/linux.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.10/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,14 +266,14 @@ lxml==4.9.2
# xmldiff
mako==1.2.4
# via -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/pkg/py3.10/linux.txt
# -r requirements/base.txt
# jinja2
# mako
# werkzeug
mercurial==6.4.4
mercurial==7.2.2
# via -r requirements/static/ci/linux.in
mock==5.1.0
# via -r requirements/pytest.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jmespath==1.0.1
# botocore
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -r requirements/static/ci/tools.in
# jinja2
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.11/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ looseversion==1.3.0
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/changelog.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# jinja2
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.11/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ mako==1.3.10
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# -c requirements/static/pkg/py3.11/linux.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,14 @@ lxml==6.0.2
# xmldiff
mako==1.3.10
# via -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/pkg/py3.11/darwin.txt
# -r requirements/base.txt
# jinja2
# mako
# werkzeug
mercurial==6.0.1
mercurial==7.2.2
# via -r requirements/static/ci/darwin.in
mock==5.1.0
# via -r requirements/pytest.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.11/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ markdown-it-py==2.2.0
# via
# mdit-py-plugins
# myst-docutils
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/base.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/freebsd.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,14 @@ lxml==6.1.0
# xmldiff
mako==1.3.10
# via -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/pkg/py3.11/freebsd.txt
# -r requirements/base.txt
# jinja2
# mako
# werkzeug
mercurial==6.0.1
mercurial==7.2.2
# via -r requirements/static/ci/freebsd.in
mock==5.1.0
# via -r requirements/pytest.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/lint.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ mako==1.3.10
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.11/linux.txt
# -c requirements/static/pkg/py3.11/linux.txt
Expand All @@ -364,7 +364,7 @@ markupsafe==2.1.3
# werkzeug
mccabe==0.6.1
# via pylint
mercurial==6.0.1
mercurial==7.2.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/linux.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.11/linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,14 @@ lxml==6.0.2
# xmldiff
mako==1.3.10
# via -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/pkg/py3.11/linux.txt
# -r requirements/base.txt
# jinja2
# mako
# werkzeug
mercurial==6.0.1
mercurial==7.2.2
# via -r requirements/static/ci/linux.in
mock==5.1.0
# via -r requirements/pytest.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.11/tools.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jmespath==1.0.1
# botocore
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -r requirements/static/ci/tools.in
# jinja2
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.12/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ looseversion==1.3.0
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/changelog.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.12/linux.txt
# jinja2
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.12/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ mako==1.3.10
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.12/linux.txt
# -c requirements/static/pkg/py3.12/linux.txt
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/py3.12/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,14 @@ lxml==6.0.2
# xmldiff
mako==1.3.10
# via -r requirements/static/ci/common.in
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/pkg/py3.12/darwin.txt
# -r requirements/base.txt
# jinja2
# mako
# werkzeug
mercurial==6.0.1
mercurial==7.2.2
# via -r requirements/static/ci/darwin.in
mock==5.1.0
# via -r requirements/pytest.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.12/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ markdown-it-py==2.2.0
# via
# mdit-py-plugins
# myst-docutils
markupsafe==2.1.3
markupsafe==2.1.5
# via
# -c requirements/static/ci/py3.12/linux.txt
# -r requirements/base.txt
Expand Down
Loading
Loading