Skip to content

[3006.x] Python 3.11 #68018

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

[3006.x] Python 3.11 #68018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1d497c8
Try python 3.11
dwoz Apr 17, 2025
5dd879e
Update mac and win package requirements for 3.11
dwoz Apr 17, 2025
b1cd010
Update pyvenv.cnf when decompressing nox
dwoz Apr 18, 2025
7a6d215
Test fixes
dwoz Apr 19, 2025
50ba681
fix test_pip on Windows
twangboy May 7, 2025
b6bc730
Make the workflows use 3.11 as well
twangboy May 9, 2025
e57f525
Fix pre-commit
dwoz May 11, 2025
13fe09e
Windows upgrade/downgrade test fix
dwoz May 12, 2025
35f8591
Fix timelib version on 3.11
dwoz May 13, 2025
5247fe0
Fix frozenlist version
dwoz May 13, 2025
975acaf
Update setuptools version
dwoz May 13, 2025
bc03224
update jaraco version
dwoz May 13, 2025
b58115a
Bump cassandra driver version
dwoz May 13, 2025
71f9735
Fix yarl version
dwoz May 13, 2025
a831382
Bump cherrypy for 3.11
dwoz May 13, 2025
ff296ea
Account for change in subprocess module
dwoz May 13, 2025
190879e
Fix some broken tests
dwoz May 13, 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
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.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 @@ -428,7 +428,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -442,9 +442,9 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -460,8 +460,8 @@ jobs:
nox-session: ci-test-onedir
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -476,10 +476,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
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.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}
workflow-slug: ci
default-timeout: 180
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.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 @@ -478,7 +478,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -498,7 +498,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -516,9 +516,9 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -534,8 +534,8 @@ jobs:
nox-session: ci-test-onedir
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -550,10 +550,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
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.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
skip-code-coverage: true
workflow-slug: nightly
default-timeout: 360
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.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 @@ -463,7 +463,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -477,9 +477,9 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -495,8 +495,8 @@ jobs:
nox-session: ci-test-onedir
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -511,10 +511,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
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.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
skip-code-coverage: true
workflow-slug: scheduled
default-timeout: 360
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.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 @@ -469,7 +469,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.11"
source: "onedir"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -490,7 +490,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.2"
python-version: "3.10.17"
python-version: "3.11.11"
source: "src"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
linux_arm_runner: ${{ fromJSON(needs.prepare-workflow.outputs.config)['linux_arm_runner'] }}
Expand All @@ -508,9 +508,9 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
python-version: "3.11"
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -526,8 +526,8 @@ jobs:
nox-session: ci-test-onedir
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
python-version: "3.10"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.17
python-version: "3.11"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
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 @@ -542,10 +542,10 @@ jobs:
with:
nox-session: ci-test-onedir
nox-version: 2022.8.7
python-version: "3.10"
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.10.17
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.11.11
skip-code-coverage: true
workflow-slug: staging
default-timeout: 180
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/templates/layout.yml.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<%- set skip_test_coverage_check = skip_test_coverage_check|default("${{ fromJSON(needs.prepare-workflow.outputs.config)['skip_code_coverage'] }}") %>
<%- set gpg_key_id = "64CBBC8173D76B3F" %>
<%- set prepare_actual_release = prepare_actual_release | default(False) %>
<%- set gh_actions_workflows_python_version = "3.10" %>
<%- set gh_actions_workflows_python_version = "3.11" %>
<%- set nox_archive_hashfiles = "${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py', 'pkg/common/env-cleanup-rules.yml', '.github/workflows/build-deps-ci-action.yml') }}" %>
---
<%- block name %>
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,5 +1,5 @@
nox_version: "2022.8.7"
python_version: "3.10.17"
python_version: "3.11.11"
relenv_version: "0.19.2"
pr-testrun-slugs:
- ubuntu-24.04-pkg
Expand Down
21 changes: 21 additions & 0 deletions noxfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1266,6 +1266,27 @@ def decompress_dependencies(session):

session.log("Finding broken 'python' symlinks under '.nox/' ...")
for dirname in os.scandir(REPO_ROOT / ".nox"):
pyenv = REPO_ROOT.joinpath(".nox", dirname, "pyvenv.cfg")
pyenv_vars = []
if os.path.exists(pyenv):
# Update pyvenv.cnf configuration in case the location of
# everything changed.
with open(pyenv, encoding="utf-8") as fp:
for line in fp.readlines():
k, v = (_.strip() for _ in line.split("=", 1))
if k in [
"home",
"base-prefix",
"base-exec-prefix",
"base-executable",
]:
root, _path = v.split("artifacts" + os.path.sep, 1)
v = str(REPO_ROOT / "artifacts" / _path)
pyenv_vars.append((k, v))
with open(pyenv, "w", encoding="utf-8") as fp:
for k, v in pyenv_vars:
fp.write(f"{k} = {v}\n")

scan_path = REPO_ROOT.joinpath(".nox", dirname, scripts_dir_name)
script_paths = {str(p): p for p in os.scandir(scan_path)}
fixed_shebang = f"#!{scan_path / 'python'}"
Expand Down
11 changes: 11 additions & 0 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,14 @@ croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'
contextvars
cryptography>=42.0.0
urllib3>=1.26.20,<2.0.0
more-itertools>=8.3.0; sys_platform == 'darwin' and python_version >= '3.11'
lxml>=4.6.3; sys_platform == 'win32' and python_version < '3.11'
lxml>=5.3.2; sys_platform == 'win32' and python_version >= '3.11'
timelib>=0.2.5; python_version < '3.11'
timelib>=0.3.0; python_version >= '3.11'
frozenlist>=1.3.0; python_version < '3.11'
frozenlist>=0.4.1; python_version >= '3.11'
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'
4 changes: 2 additions & 2 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
wheel <= 0.45.1
setuptools >= 65.6.3,< 69.0
wheel
setuptools < 80.0.0
setuptools-scm < 8.0.0
pip >= 23.3,< 24.0 ; python_version < '3.12'
pip >24 ; python_version >= '3.12'
1 change: 0 additions & 1 deletion requirements/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
-r zeromq.txt

apache-libcloud>=2.4.0
cherrypy>=17.4.1
gitpython>=3.1.37
idna>=2.8
linode-python>=1.1.1
Expand Down
5 changes: 4 additions & 1 deletion requirements/static/ci/common.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
apache-libcloud>=1.5.0; sys_platform != 'win32'
boto3>=1.17.67
boto>=2.46.0
cassandra-driver>=2.0
cassandra-driver>=2.0 ; python_version < '3.11'
cassandra-driver>=3.28.0 ; python_version >= '3.11'
cffi>=1.14.6
cherrypy>=17.4.1
clustershell
Expand Down Expand Up @@ -47,3 +48,5 @@ genshi>=0.7.3
cheetah3>=3.2.2
mako
wempy
yarl >= 1.7.2 ; python_version < '3.11'
yarl >= 1.9.4 ; python_version >= '3.11'
Loading