8000 [3007.x] Python 3.11 by dwoz · Pull Request #67964 · saltstack/salt · GitHub
[go: up one dir, main page]
Skip to content

[3007.x] Python 3.11 #67964

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

[3007.x] Python 3.11 #67964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
beb30fb
Bump ssm-code-signing to v1.0.0
twangboy May 8, 2025
d80cbe1
Add SM_CODE_SIGNING_CERT_SHA1_HASH environment when signing
dwoz May 8, 2025
af7c91d
Enable signing debug for windows
dwoz May 8, 2025
ca25fa8
Try running register first
dwoz May 9, 2025
6b5babc
Try smctl for signing
dwoz May 10, 2025
e2b8f04
Fix syntax
dwoz May 10, 2025
3ae982a
Fix slash escape
dwoz May 10, 2025
a58c354
Add verbose flag to sign tool
dwoz May 10, 2025
8300644
Add healthcheck for windows signing
twangboy May 12, 2025
08811f4
Try python 3.11
dwoz Apr 17, 2025
043eb9f
Update mac and win package requirements for 3.11
dwoz Apr 17, 2025
6005888
Update pyvenv.cnf when decompressing nox
dwoz Apr 18, 2025
c5df2d6
Test fixes
dwoz Apr 19, 2025
3308a31
fix test_pip on Windows
twangboy May 7, 2025
ac5ca76
Make the workflows use 3.11 as well
twangboy May 9, 2025
1e8caaa
Fix pre-commit
dwoz May 11, 2025
11132c4
Windows upgrade/downgrade test fix
dwoz May 12, 2025
b2cbde4
Account for change in subprocess module
dwoz May 13, 2025
bda4e25
Merge branch '3007.x' into try-3.11
twangboy 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
9 changes: 4 additions & 5 deletions .github/workflows/build-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,17 +442,16 @@ jobs:
name: salt-${{ inputs.salt-version }}-onedir-windows-${{ matrix.arch }}.zip
path: artifacts/

- name: Code signing with Software Trust Manager
if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
uses: digicert/ssm-code-signing@v1.0.0

- name: Setup Certificate
if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
shell: bash
run: |
echo "${{ secrets.WIN_SIGN_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12


- name: Code signing with Software Trust Manager
if: ${{ steps.check-pkg-sign.outputs.sign-pkgs == 'true' }}
uses: digicert/ssm-code-signing@v0.0.2

- name: Build Windows Packages
run: |
tools pkg build windows --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
Expand Down
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 @@ -434,7 +434,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.0"
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 @@ -449,7 +449,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.0"
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 @@ -463,9 +463,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 @@ -481,8 +481,8 @@ jobs:
nox-session: ci-test-onedir
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
nox-version: 2022.8.7
python-version: "3.10&quo 6DB6 t;
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 @@ -497,10 +497,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 @@ -487,7 +487,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.0"
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 @@ -502,7 +502,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.0"
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 @@ -522,7 +522,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.0"
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 @@ -540,9 +540,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 @@ -558,8 +558,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 @@ -574,10 +574,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 @@ -477,7 +477,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.0"
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 @@ -492,7 +492,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.0"
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 @@ -506,9 +506,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 @@ -524,8 +524,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 @@ -540,10 +540,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 @@ -474,7 +474,7 @@ jobs:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.19.0"
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 @@ -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.0"
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 @@ -511,7 +511,7 @@ jobs:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.19.0"
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 @@ -529,9 +529,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 @@ -547,8 +547,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 @@ -563,10 +563,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.0"
release_branches:
- "3006.x"
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 @@ -1273,6 +1273,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
17 changes: 9 additions & 8 deletions requirements/base.txt
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ packaging>=21.3,<=24.0
looseversion
tornado>=6.4.1
aiohttp>=3.9.0
urllib3>=1.26.18
urllib3>=1.26.20,<2.0.0
jaraco.text>=4.0.0
jaraco.functools>=4.1.0

Expand All @@ -31,24 +31,25 @@ pyopenssl>=24.0.0
python-dateutil>=2.8.1
python-gnupg>=0.4.7
cherrypy>=18.6.1

# We need contextvars for salt-ssh
contextvars
importlib-metadata>=3.3.0
cryptography>=42.0.0

# We need contextvars for salt-ssh
more-itertools>=8.3.0; sys_platform == 'darwin' and python_version >= '3.11'

# From old requirements/static/pkg/linux.in
rpm-vercmp; sys_platform == 'linux'

# From old windows.txt requirements file
gitpython>=3.1.37; sys_platform == 'win32'
lxml>=4.6.3; sys_platform == 'win32'
lxml>=4.6.3; sys_platform == 'win32' and python_version < '3.11'
lxml>=5.3.2; sys_platform == 'win32' and python_version >= '3.11'
pymssql>=2.2.11; sys_platform == 'win32'
pymysql>=1.0.2; sys_platform == 'win32'
pythonnet>=3.0.1; sys_platform == 'win32'
pywin32>=305; sys_platform == 'win32'
wmi>=1.5.1; sys_platform == 'win32'
xmltodict>=0.13.0; sys_platform == 'win32'
croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'

# We need contextvars for salt-ssh
contextvars
cryptography>=42.0.0
urllib3>=1.26.20,<2.0.0
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.10/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ looseversion==1.3.0
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
lxml==4.9.2 ; sys_platform == "win32"
lxml==4.9.2 ; sys_platform == "win32" and python_version < "3.11"
# via
# -c requirements/static/ci/../pkg/py3.10/windows.txt
# -r requirements/base.txt
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.11/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,10 @@ mercurial==6.0.1
# via -r requirements/static/ci/darwin.in
mock==5.1.0
# via -r requirements/pytest.txt
more-itertools==8.2.0
more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11"
# via
# -c requirements/static/ci/../pkg/py3.11/darwin.txt
# -r requirements/base.txt
# -r requirements/pytest.txt
# cheroot
# cherrypy
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.11/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ looseversion==1.3.0
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
lxml==4.9.1 ; sys_platform == "win32"
lxml==5.4.0 ; sys_platform == "win32" and python_version >= "3.11"
# via
# -c requirements/static/ci/../pkg/py3.11/windows.txt
# -r requirements/base.txt
Expand Down
3 changes: 2 additions & 1 deletion requirements/static/ci/py3.12/darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,10 @@ mercurial==6.0.1
# via -r requirements/static/ci/darwin.in
mock==5.1.0
# via -r requirements/pytest.txt
more-itertools==8.2.0
more-itertools==10.7.0 ; sys_platform == "darwin" and python_version >= "3.11"
# via
# -c requirements/static/ci/../pkg/py3.12/darwin.txt
# -r requirements/base.txt
# -r requirements/pytest.txt
# cheroot
# cherrypy
Expand Down
2 changes: 1 addition & 1 deletion requirements/static/ci/py3.12/windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ looseversion==1.3.0
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
lxml==4.9.1 ; sys_platform == "win32"
lxml==5.4.0 ; sys_platform == "win32" and python_version >= "3.11"
# via
# -c requirements/static/ci/../pkg/py3.12/windows.txt
# -r requirements/base.txt
Expand Down
Loading
0