Skip to content

Bump python version to 3.12 #68843

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: master
Choose a base branch
from
Open

Bump python version to 3.12 #68843

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
324eb9e
Bump python version to 3.12
dwoz Mar 25, 2026
798f15d
Use wheel for attrs to avoid building setuptools-scm
dwoz Mar 26, 2026
4ce4301
Use binary setuptools-scm
dwoz Mar 26, 2026
c1fc817
Add pluggy to only-binary to avoid setuptools-scm
dwoz Mar 26, 2026
14d9636
Revert only binary changes
dwoz Mar 26, 2026
88504c8
Fix multidict build on macos
dwoz Mar 27, 2026
90f5d4d
Update ci deps for python 3.12
dwoz Mar 27, 2026
b12f2a0
Fix ci deps
dwoz Mar 28, 2026
6c9d813
more ci fixes
dwoz Mar 28, 2026
737043d
Fix Python 3.12 test failures: imp module, assertDictContainsSubset, …
Copilot Apr 4, 2026
195f9a0
Fix Python 3.12 compatibility: remove uses of imp, assertDictContains…
Copilot Apr 4, 2026
73ae0b4
Fix Python 3.12 compatibility: imp, assertDictContainsSubset, distuti…
Copilot Apr 4, 2026
bb93c49
Remove changes already fixed in pyversion branch (versions.py, test_z…
Copilot Apr 4, 2026
3be4518
Fix Python 3.12 pip compatibility: update pip requirement and skip ol…
Copilot Apr 4, 2026
88f9434
Fix black formatting in tests/support/unit.py
Copilot Apr 5, 2026
1b6006e
Fix Python 3.12 incompatibilities: imp, pkg_resources, utcnow
Copilot Apr 5, 2026
76b9e0f
Fix Python 3.12 compatibility issues
dwoz Apr 5, 2026
e1a8856
Fix pylint duplicate string formatting argument warning
dwoz Apr 5, 2026
90454c5
Fix Python 3.12 datetime deprecation in test SSL fixtures
dwoz Apr 5, 2026
fae0620
Fix Python 3.12 datetime deprecation in test files
dwoz Apr 5, 2026
8371940
Fix Python 3.12 importlib compatibility in test_zypp_plugins
dwoz Apr 6, 2026
185f17f
Fix Python 3.12 datetime deprecations and test collection errors
dwoz Apr 6, 2026
8a5661b
Fix KeyError in test_pkg.py when osmajorrelease grain is missing
dwoz Apr 6, 2026
57643f6
Fix Python 3.12 VirtualEnv pip compatibility
dwoz Apr 6, 2026
8307b7e
Fix winrepo legacy git to return paths instead of booleans
dwoz Apr 6, 2026
29957da
Fix Python 3.12 test_thin backports module check
dwoz Apr 7, 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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -487,7 +487,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -504,7 +504,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -519,10 +519,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -539,7 +539,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -557,7 +557,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -482,7 +482,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -503,7 +503,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -522,10 +522,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -542,7 +542,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -560,7 +560,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -530,7 +530,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -547,7 +547,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -562,10 +562,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -582,7 +582,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -600,7 +600,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: true
workflow-slug: scheduled
default-timeout: 360
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -515,7 +515,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -537,7 +537,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.4"
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -556,10 +556,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.11.14"
python-version: "3.12.12"
ci-python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -576,7 +576,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
ci-python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: true
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['pkg-test-matrix']) }}
Expand All @@ -594,7 +594,7 @@ jobs:
ci-python-version: "3.11"
testrun: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['testrun']) }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.14
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.12.12
skip-code-coverage: true
workflow-slug: staging
default-timeout: 180
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
Expand Up @@ -3,7 +3,7 @@

# Tool versions
nox_version: "2022.8.7"
python_version: "3.11.14"
python_version: "3.12.12"
relenv_version: "0.22.4"
release_branches:
- "3006.x"
Expand Down
2 changes: 1 addition & 1 deletion pkg/macos/install_salt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ fi
# Install Requirements into the Python Environment
#-------------------------------------------------------------------------------
_msg "Installing Salt requirements"
$PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
CFLAGS="${CFLAGS} -Wno-int-conversion" $PIP_BIN install -r "$REQ_FILE" > /dev/null 2>&1
if [ -f "$BUILD_DIR/bin/distro" ]; then
_success
else
Expand Down
1 change: 1 addition & 0 deletions requirements/static/ci/common.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ google-auth==2.35.0; python_version == '3.9'
jmespath>=1.1.0
jsonschema
junos-eznc; sys_platform != 'win32'
ncclient>=0.6.16; sys_platform != 'win32'
junit-xml>=1.9
jxmlease; sys_platform != 'win32'
kazoo; sys_platform != 'win32' and sys_platform != 'darwin'
Expand Down
4 changes: 2 additions & 2 deletions requirements/static/ci/darwin.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pygit2>=1.10.1
pygit2>=1.14.0
yamllint
mercurial
mercurial>=6.7
hglib
# Pin versions to match 3007.x
apache-libcloud>=3.8.0
Expand Down
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>=6.7
hglib
4 changes: 2 additions & 2 deletions requirements/static/ci/linux.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Linux static CI requirements
pyiface
pygit2>=1.10.1
pygit2>=1.14.0
pymysql>=1.1.1
ansible>=10.7.0; python_version >= '3.10' and python_version < '3.11'
ansible>=12.3.0; python_version >= '3.11' and python_version < '3.12'
Expand All @@ -10,7 +10,7 @@ ansible>=4.4.0,<5.0.1; python_version < '3.9'
twilio
python-telegram-bot>=13.7
yamllint
mercurial
mercurial>=6.7
hglib
redis-py-cluster
python-consul
Expand Down
23 changes: 12 additions & 11 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 @@ -231,6 +231,10 @@ iniconfig==2.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# pytest
invoke==2.2.1
# via
# -c requirements/static/ci/py3.10/linux.txt
# paramiko
jaraco-collections==4.1.0
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -279,7 +283,7 @@ junit-xml==1.9
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
junos-eznc==2.6.7
junos-eznc==2.7.6
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
Expand Down Expand Up @@ -308,7 +312,7 @@ looseversion==1.3.0
# -c requirements/static/ci/py3.10/linux.txt
# -c requirements/static/pkg/py3.10/linux.txt
# -r requirements/base.txt
lxml==4.9.2
lxml==6.0.2
# via
# -c requirements/static/ci/py3.10/linux.txt
# junos-eznc
Expand Down Expand Up @@ -357,15 +361,13 @@ multidict==6.7.1
# -c requirements/static/pkg/py3.10/linux.txt
# aiohttp
# yarl
ncclient==0.6.13
ncclient==0.7.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
# junos-eznc
netaddr==0.8.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/cloud.in
# junos-eznc
# via -r requirements/static/ci/cloud.in
oauthlib==3.3.1
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand All @@ -380,7 +382,7 @@ packaging==24.0
# -c requirements/static/pkg/py3.10/linux.txt
# -r requirements/base.txt
# pytest
paramiko==3.4.0
paramiko==4.0.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# -r requirements/static/ci/common.in
Expand Down Expand Up @@ -580,7 +582,7 @@ pyyaml==6.0.1
# kubernetes
# pytest-salt-factories
# responses
# yamlordereddictloader
# yamlloader
pyzmq==25.1.2
# via
# -c requirements/static/ci/py3.10/linux.txt
Expand Down Expand Up @@ -653,7 +655,6 @@ six==1.16.0
# junos-eznc
# kazoo
# kubernetes
# ncclient
# profitbricks
# python-dateutil
# pyvmomi
Expand Down Expand Up @@ -783,7 +784,7 @@ xmltodict==0.13.0
# -c requirements/static/ci/py3.10/linux.txt
# moto
# pywinrm
yamlordereddictloader==0.4.0
yamlloader==1.6.0
# via
# -c requirements/static/ci/py3.10/linux.txt
# junos-eznc
Expand Down
Loading
Loading