Skip to content

Merge forward 3006.x into 3007.x #68758

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

Open
dwoz wants to merge 26 commits into
base: 3007.x
Choose a base branch
from
+12,543 −5,316
Open

Merge forward 3006.x into 3007.x #68758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c7153d8
Update relenv to 0.22.4
twangboy Feb 18, 2026
d44dc05
Windows has slightly different paths
twangboy Feb 19, 2026
7ee0791
Fix formatting and put it back on common
twangboy Feb 20, 2026
a5aa3be
Move linux back to dir_patterns
twangboy Feb 20, 2026
6dd925b
Update virtualenv embedded wheels manually
twangboy Feb 20, 2026
a0ff328
Update the __init__.py file
twangboy Feb 20, 2026
5086e2f
Fix some lint
twangboy Feb 20, 2026
55f52a6
Fix pre-commit
twangboy Feb 20, 2026
e2e8e5e
Fix SyntaxWarning for invalid escape sequence in tornado/util.py
AhmadYasser1 Feb 9, 2026
6e3c7dc
Upgrade cryptography
dwoz Feb 19, 2026
05bc87d
Fix whl file filter
dwoz Feb 19, 2026
58559ca
Accept maturin binary for now
dwoz Feb 19, 2026
512b048
Test fixes
dwoz Feb 19, 2026
03f62f6
Fix crypto tests
dwoz Feb 20, 2026
41f942b
Update vcert
dwoz Feb 20, 2026
4779d9a
Multiple test fixes
dwoz Feb 20, 2026
7629d30
Test fixes
dwoz Feb 20, 2026
24c39d3
Wait for minions to stop, then be aggressive
dwoz Feb 20, 2026
c44b874
Windows upgrade fix
dwoz Feb 20, 2026
776f7bd
Revert pkg cleanup rule that did not work
dwoz Feb 20, 2026
68169f6
More agressive process termination
dwoz Feb 20, 2026
66b0acc
Kill processes if needed
dwoz Feb 20, 2026
b1bd692
Fix downgrade
dwoz Feb 21, 2026
ca3621f
Merge branch '3006.x' into merge/3006.x/3007.x-25-02-21
dwoz Feb 22, 2026
6db20eb
Fix merge warts
dwoz Feb 22, 2026
44fbc96
Reduce flakiness in salt upgrade/downgrade tests
dwoz Feb 22, 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 @@ -462,7 +462,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -479,7 +479,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -496,7 +496,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
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 @@ -515,7 +515,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -532,7 +532,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -553,7 +553,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
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 @@ -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.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
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.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -539,7 +539,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
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 @@ -489,7 +489,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
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.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -529,7 +529,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "src"
Expand Down
Loading
Loading