Skip to content

Merge forward 3007.x into master #68169

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
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

Merge forward 3007.x into master #68169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
8e50f91
Upgrade urllib3 to > 2.0
dwoz Jul 5, 2025
b2d1a91
Pull in constraints from 3007.x
dwoz Jul 6, 2025
2db1128
Bump cherrypy version
dwoz Jul 7, 2025
2ca989f
Bump more-itertools
dwoz Jul 7, 2025
f553965
Bump more-itertools
dwoz Jul 8, 2025
37f02ac
Fix lint jaraco requirements
dwoz Jul 8, 2025
de44a60
Bump packaging version
dwoz Jul 8, 2025
518c3e1
wip
dwoz Jul 5, 2025
830d5ec
Update more workflow steps to use py 3.11
dwoz Jul 5, 2025
fcf3f85
Pass ci python version into workflows
dwoz Jul 8, 2025
7dfcfcb
Fix python version input in test action
dwoz Jul 8, 2025
324d54d
Lint everything on full test run
dwoz Jul 8, 2025
4e97dcb
Run NSIS on full testruns
dwoz Jul 8, 2025
6ecca63
Build deps uses ci-python-version
dwoz Jul 8, 2025
3db8ba0
Fix full check for lint and nsis
dwoz Jul 8, 2025
6decc74
Fix full conditional
dwoz Jul 9, 2025
5ffa329
Fix lint action conditional
dwoz Jul 9, 2025
488e254
Bump cache seed
dwoz Jul 9, 2025
0d04d24
Clean up more workflow python versions
dwoz Jul 9, 2025
21511ce
Fix depcheck
dwoz Jul 9, 2025
e673bad
More fixes for depscheck workflow
dwoz Jul 9, 2025
ebc8bd4
Bump cache seed
dwoz Jul 9, 2025
5c66a7c
Merge branch '3006.x' into merge/3007.x/3006.x-2025-06-09
dwoz Jul 9, 2025
19b8aec
Ensure _get_test_value returns only boolean values
DdangJin Jun 27, 2025
7e8ca6e
Ensure "test" returns only boolean values
DdangJin Jun 27, 2025
5448f3f
Add tests for LazyLoader options and ensure test value is boolean
DdangJin Jun 27, 2025
fc21663
Add changelog
DdangJin Jun 29, 2025
3e0ae8d
Add missing changelog
dwoz Jul 9, 2025
0bcda9c
Merge pull request #68164 from dwoz/merge/3007.x/3006.x-2025-06-09
dwoz Jul 9, 2025
ded1ce9
Release v3006.14
saltbot-open Jul 10, 2025
b70ce36
Merge remote-tracking branch 'saltstack/3006.x' into merge/3007.x/300…
dwoz Jul 10, 2025
b6bbdd7
Bump cache seed
dwoz Jul 10, 2025
f55350a
Merge pull request #68166 from dwoz/merge/3007.x/3006.x-25-07-10
dwoz Jul 10, 2025
36473fc
Merge branch '3006.x' into merge/3007.x/3006.x-25-07-10.1
dwoz Jul 10, 2025
a4670ac
Add changelogs from 3006.x
dwoz Jul 10, 2025
124b126
Merge pull request #68168 from dwoz/merge/3007.x/3006.x-25-07-10.1
dwoz Jul 10, 2025
634be44
Release v3007.6
saltbot-open Jul 10, 2025
40dae30
Update werkzeug to 3.1.3
twangboy Jul 8, 2025
cb70ab0
Update immutables to 0.21
twangboy Jul 8, 2025
17787cf
Merge branch '3007.x' into merge/master/3007.x-25-07-10
dwoz Jul 10, 2025
a221383
Fix merge wart
dwoz Jul 11, 2025
48c7d58
Bump relenv version to 0.20.0
dwoz Jul 15, 2025
bbc545f
No longer run toolchain fetch
dwoz Jul 15, 2025
39a7bcf
Install ppbt when building onedir deps
dwoz Jul 15, 2025
0d5a9a2
Debug build
dwoz Jul 16, 2025
8c7fe99
more debug
dwoz Jul 16, 2025
0b83962
Monkey patch ptscripts to debug workflow
dwoz Jul 16, 2025
c014440
Remove monkey patching
dwoz Jul 16, 2025
1f02f88
Add arch to tools scripts cache seed for windows
dwoz Jul 16, 2025
a86acc6
Install ppbt instead of toolchain fetch
dwoz Jul 16, 2025
8eccf55
Bump relenv version to 0.20.1
dwoz Jul 17, 2025
d021d9f
No longer list d: on windows
dwoz Jul 17, 2025
0d98e54
Build ci deps on windows 2025
dwoz Jul 17, 2025
b101aed
Build onedir on windows 2025
dwoz Jul 17, 2025
fe18c25
Fix venv config
dwoz Jul 19, 2025
a62e5f1
Photon OS enforces signature checking by defualt
dwoz Jul 19, 2025
551d83b
Revert "Build onedir on windows 2025"
dwoz Jul 19, 2025
f1a7488
Revert "Build ci deps on windows 2025"
dwoz Jul 19, 2025
6699482
Bump cache seed
dwoz Jul 19, 2025
86b4edc
Windows 2025 test fix
dwoz Jul 19, 2025
c4c82e7
Merge branch '3006.x' into merge/3007.x/3006.x-25-07-19
dwoz Jul 19, 2025
4205213
The d drive does not exist on windows 2025
dwoz Jul 19, 2025
68aa014
Fix merge wart
dwoz Jul 19, 2025
2c4c504
Allow for older immutables version on linux
dwoz Jul 20, 2025
190409b
Merge pull request #68198 from dwoz/merge/3007.x/3006.x-25-07-19
dwoz Jul 21, 2025
3c47fe7
Merge remote-tracking branch 'saltstack/3007.x' into merge/master/300…
dwoz Jul 21, 2025
0c85d9a
Bump python 3.11 to 3.11.13
dwoz Jul 21, 2025
c68da53
The d drive is gone on windows-2025 runners
dwoz Jul 21, 2025
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
Prev Previous commit
Next Next commit
Update more workflow steps to use py 3.11
  • Loading branch information
@dwoz
dwoz committed Jul 9, 2025
commit 830d5ec8183aa28f77b9554823de5433aa3ab3b2
14 changes: 8 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,10 +261,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"


- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down Expand Up @@ -381,10 +382,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down Expand Up @@ -498,10 +499,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"


- name: Setup Python Tools Scripts
id: python-tools-scripts
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,10 +306,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"


- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down Expand Up @@ -431,10 +432,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"


- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down Expand Up @@ -416,10 +417,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"


- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down Expand Up @@ -412,10 +413,10 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"

- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/templates/ci.yml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python <{ gh_actions_workflows_python_version }>
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "<{ gh_actions_workflows_python_version }>"


- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down Expand Up @@ -210,10 +211,10 @@
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python <{ gh_actions_workflows_python_version }>
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "<{ gh_actions_workflows_python_version }>"

- name: Setup Python Tools Scripts
uses: ./.github/actions/setup-python-tools-scripts
Expand Down Expand Up @@ -291,10 +292,11 @@
steps:
- uses: actions/checkout@v4

- name: Set up Python 3.10
- name: Set up Python <{ gh_actions_workflows_python_version }>
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "<{ gh_actions_workflows_python_version }>"


- name: Setup Python Tools Scripts
id: python-tools-scripts
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy