Skip to content

[wip] Build more python versions in order to widen test coverage #68217

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 2 commits into
base: 3006.x
Choose a base branch
from
Open

[wip] Build more python versions in order to widen test coverage #68217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00faff5
Add the ability to build more python versions
dwoz Jul 29, 2025
1cb96e0
Update reqs for py 3.11
dwoz Jul 29, 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
2 changes: 1 addition & 1 deletion .github/actions/build-onedir-salt/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
platform: ${{ inputs.platform }}
arch: ${{ inputs.arch }}
python-version: "${{ inputs.python-version }}"
cache-prefix: ${{ inputs.cache-prefix }}|relenv|${{ inputs.salt-version }}
cache-prefix: ${{ inputs.cache-prefix }}|relenv|${{ inputs.python-version }}|${{ inputs.salt-version }}

- name: Download Source Tarball
uses: actions/download-artifact@v4
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-salt-onedir.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ jobs:
arch: ${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
python-version: ${{ inputs.python-version }}
python-version: ${{ matrix.python }}

- name: Install Salt into Relenv Onedir
uses: ./.github/actions/build-onedir-salt
with:
platform: linux
arch: ${{ matrix.arch }}
salt-version: "${{ inputs.salt-version }}"
python-version: "${{ inputs.python-version }}"
python-version: "${{ matrix.python }}"
cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }}

build-salt-macos:
Expand Down Expand Up @@ -148,15 +148,15 @@ jobs:
arch: ${{ matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
python-version: ${{ inputs.python-version }}
python-version: ${{ matrix.python }}

- name: Install Salt into Relenv Onedir
uses: ./.github/actions/build-onedir-salt
with:
platform: macos
arch: ${{ matrix.arch }}
salt-version: "${{ inputs.salt-version }}"
python-version: "${{ inputs.python-version }}"
python-version: "${{ matrix.python }}"
cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }}

build-salt-windows:
Expand Down Expand Up @@ -204,13 +204,13 @@ jobs:
arch: ${{ matrix.arch }}
version: ${{ inputs.relenv-version }}
cache-seed: ${{ inputs.cache-seed }}
python-version: ${{ inputs.python-version }}
python-version: ${{ matrix.python }}

- name: Install Salt into Relenv Onedir
uses: ./.github/actions/build-onedir-salt
with:
platform: windows
arch: ${{ matrix.arch }}
salt-version: "${{ inputs.salt-version }}"
python-version: "${{ inputs.python-version }}"
python-version: "${{ matrix.python }}"
cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ steps.setup-relenv.outputs.version }}
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ jobs:
relenv-version: "0.20.3"
python-version: "3.10.18"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

build-pkgs-onedir:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ jobs:
relenv-version: "0.20.3"
python-version: "3.10.18"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

build-pkgs-onedir:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ jobs:
relenv-version: "0.20.3"
python-version: "3.10.18"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

build-pkgs-onedir:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ jobs:
relenv-version: "0.20.3"
python-version: "3.10.18"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

build-pkgs-onedir:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/templates/ci.yml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
relenv-version: "<{ relenv_version }>"
python-version: "<{ python_version }>"
ci-python-version: "<{ gh_actions_workflows_python_version }>"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['onedir-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}

<%- endif %>
Expand Down
9 changes: 8 additions & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ psutil<6.0.0; python_version <= '3.9'
psutil>=5.0.0; python_version >= '3.10'
# Packaging 24.1 imports annotations from __future__ which breaks salt ssh
# tests on target hosts with older python versions.
packaging==24.0
packaging<=24.0; python_version <= '3.10'
packaging>=21.3,<=24.0; python_version > '3.10'
looseversion
croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'
# We need contextvars for salt-ssh
Expand All @@ -27,3 +28,9 @@ urllib3>=2.5.0; python_version >= '3.10'

jaraco.text>=4.0.0
jaraco.functools>=4.1.0
cherrypy>=18.6.1; python_version < '3.11'
cherrypy>=18.8.0; python_version >= '3.11'

timelib>=0.3.0
lxml>=4.6.3; sys_platform == 'win32' and python_version < '3.11'
lxml>=5.3.2; sys_platform == 'win32' and python_version >= '3.11'
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 @@ -25,7 +25,7 @@ markupsafe==2.1.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# jinja2
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/changelog.in
Expand Down
8 changes: 5 additions & 3 deletions requirements/static/ci/py3.10/cloud.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,11 @@ cheroot==8.5.2
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
cherrypy==18.10.0
cherrypy==18.10.0 ; python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==7.1.1
Expand Down Expand Up @@ -383,7 +384,7 @@ oscrypto==1.2.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# certvalidator
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -693,10 +694,11 @@ textfsm==1.1.3
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
timelib==0.2.5
timelib==0.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/pkg/linux.in
toml==0.10.2
# via
Expand Down
8 changes: 5 additions & 3 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 @@ -85,9 +85,10 @@ cheroot==8.5.2
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# cherrypy
cherrypy==18.6.1
cherrypy==18.6.1 ; python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
# -r requirements/darwin.txt
# -r requirements/static/ci/common.in
click==7.0
Expand Down Expand Up @@ -278,7 +279,7 @@ netaddr==0.7.19
# via junos-eznc
oscrypto==1.2.0
# via certvalidator
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -488,9 +489,10 @@ tempora==4.1.1
# portend
textfsm==1.1.3
# via -r requirements/static/ci/common.in
timelib==0.2.5
timelib==0.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/darwin.txt
# -r requirements/base.txt
# -r requirements/darwin.txt
toml==0.10.2
# via -r requirements/static/ci/common.in
Expand Down
9 changes: 7 additions & 2 deletions requirements/static/ci/py3.10/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ cheroot==8.5.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
cherrypy==18.10.0
cherrypy==18.10.0 ; python_version < "3.11"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/docs.in
contextvars==2.4
# via
Expand Down Expand Up @@ -133,7 +134,7 @@ msgpack==1.0.2
# -r requirements/base.txt
myst-docutils[linkify]==0.18.1
# via -r requirements/static/ci/docs.in
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -215,6 +216,10 @@ tempora==4.1.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# portend
timelib==0.3.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
typing-extensions==4.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down
8 changes: 5 additions & 3 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 @@ -82,9 +82,10 @@ cheroot==8.5.2
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# cherrypy
cherrypy==18.6.1
cherrypy==18.6.1 ; python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/freebsd.in
click==7.1.2
Expand Down Expand Up @@ -268,7 +269,7 @@ netaddr==0.7.19
# via junos-eznc
oscrypto==1.2.0
# via certvalidator
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -478,9 +479,10 @@ tempora==4.1.1
# portend
textfsm==1.1.3
# via -r requirements/static/ci/common.in
timelib==0.2.5
timelib==0.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/freebsd.txt
# -r requirements/base.txt
# -r requirements/static/pkg/freebsd.in
toml==0.10.2
# via -r requirements/static/ci/common.in
Expand Down
8 changes: 5 additions & 3 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 @@ -126,10 +126,11 @@ cheroot==8.5.2
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# cherrypy
cherrypy==18.10.0
cherrypy==18.10.0 ; python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==7.1.1
Expand Down Expand Up @@ -384,7 +385,7 @@ oscrypto==1.2.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# certvalidator
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -669,10 +670,11 @@ textfsm==1.1.3
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
timelib==0.2.5
timelib==0.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/pkg/linux.in
toml==0.10.2
# via
Expand Down
8 changes: 5 additions & 3 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 @@ -91,9 +91,10 @@ cheroot==8.5.2
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# cherrypy
cherrypy==18.10.0
cherrypy==18.10.0 ; python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# -r requirements/static/pkg/linux.in
click==7.1.1
Expand Down Expand Up @@ -279,7 +280,7 @@ netaddr==0.7.19
# via junos-eznc
oscrypto==1.2.0
# via certvalidator
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -521,9 +522,10 @@ tempora==4.1.1
# portend
textfsm==1.1.3
# via -r requirements/static/ci/common.in
timelib==0.2.5
timelib==0.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/linux.txt
# -r requirements/base.txt
# -r requirements/static/pkg/linux.in
toml==0.10.2
# via -r requirements/static/ci/common.in
Expand Down
11 changes: 7 additions & 4 deletions requirements/static/ci/py3.10/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,10 @@ cheroot==8.5.2
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# cherrypy
cherrypy==18.6.1
cherrypy==18.6.1 ; python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
# -r requirements/static/ci/common.in
# -r requirements/windows.txt
click==7.1.2
Expand Down Expand Up @@ -216,9 +217,10 @@ looseversion==1.0.2
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
lxml==4.9.1
lxml==4.9.1 ; sys_platform == "win32" and python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
# -r requirements/windows.txt
mako==1.2.2
# via -r requirements/static/ci/common.in
Expand Down Expand Up @@ -253,7 +255,7 @@ multidict==6.0.2
# yarl
ntlm-auth==1.5.0
# via requests-ntlm
packaging==24.0
packaging==24.0 ; python_version <= "3.10"
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -464,9 +466,10 @@ tempora==4.1.1
# portend
textfsm==1.1.3
# via -r requirements/static/ci/common.in
timelib==0.2.5
timelib==0.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
# -r requirements/windows.txt
toml==0.10.2
# via -r requirements/static/ci/common.in
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 @@ -25,7 +25,7 @@ markupsafe==2.1.2
# via
# -c requirements/static/ci/py3.11/linux.txt
# jinja2
packaging==24.0
packaging==24.0 ; python_version > "3.10"
# via
# -c requirements/static/ci/py3.11/linux.txt
# -r requirements/static/ci/changelog.in
Expand Down
Loading
Loading