[Bot] Update dependencies (#2426)
* Update dependencies * tests: ignore tag order Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> * tests: use sorted platform tags Per PEP 425, compressed tag sets should be sorted. This was fixed in auditwheel 6.4.0 * tests: use sorted platform tags this shouldn't change that often, use static order to allow override. --------- Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Co-authored-by: Henry Schreiner <henryschreineriii@gmail.com> Co-authored-by: mayeut <mayeut@users.noreply.github.com>
This commit is contained in:
co-authored by
cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com>
Henry Schreiner
mayeut
parent
7e099863cd
commit
0e8f4f777d
@@ -165,12 +165,12 @@ python_configurations = [
|
||||
{ identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" },
|
||||
{ identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" },
|
||||
{ identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.3/python-3.13.3-macos11.pkg" },
|
||||
{ identifier = "cp314-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" },
|
||||
{ identifier = "cp314-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" },
|
||||
{ identifier = "cp314-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" },
|
||||
{ identifier = "cp314t-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" },
|
||||
{ identifier = "cp314t-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" },
|
||||
{ identifier = "cp314t-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b1-macos11.pkg" },
|
||||
{ identifier = "cp314-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" },
|
||||
{ identifier = "cp314-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" },
|
||||
{ identifier = "cp314-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" },
|
||||
{ identifier = "cp314t-macosx_x86_64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" },
|
||||
{ identifier = "cp314t-macosx_arm64", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" },
|
||||
{ identifier = "cp314t-macosx_universal2", version = "3.14", url = "https://www.python.org/ftp/python/3.14.0/python-3.14.0b2-macos11.pkg" },
|
||||
{ identifier = "pp38-macosx_x86_64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_x86_64.tar.bz2" },
|
||||
{ identifier = "pp38-macosx_arm64", version = "3.8", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-macos_arm64.tar.bz2" },
|
||||
{ identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-macos_x86_64.tar.bz2" },
|
||||
@@ -199,18 +199,18 @@ python_configurations = [
|
||||
{ identifier = "cp313t-win32", version = "3.13.3", arch = "32" },
|
||||
{ identifier = "cp313-win_amd64", version = "3.13.3", arch = "64" },
|
||||
{ identifier = "cp313t-win_amd64", version = "3.13.3", arch = "64" },
|
||||
{ identifier = "cp314-win32", version = "3.14.0-b1", arch = "32" },
|
||||
{ identifier = "cp314t-win32", version = "3.14.0-b1", arch = "32" },
|
||||
{ identifier = "cp314-win_amd64", version = "3.14.0-b1", arch = "64" },
|
||||
{ identifier = "cp314t-win_amd64", version = "3.14.0-b1", arch = "64" },
|
||||
{ identifier = "cp314-win32", version = "3.14.0-b2", arch = "32" },
|
||||
{ identifier = "cp314t-win32", version = "3.14.0-b2", arch = "32" },
|
||||
{ identifier = "cp314-win_amd64", version = "3.14.0-b2", arch = "64" },
|
||||
{ identifier = "cp314t-win_amd64", version = "3.14.0-b2", arch = "64" },
|
||||
{ identifier = "cp39-win_arm64", version = "3.9.10", arch = "ARM64" },
|
||||
{ identifier = "cp310-win_arm64", version = "3.10.11", arch = "ARM64" },
|
||||
{ identifier = "cp311-win_arm64", version = "3.11.9", arch = "ARM64" },
|
||||
{ identifier = "cp312-win_arm64", version = "3.12.10", arch = "ARM64" },
|
||||
{ identifier = "cp313-win_arm64", version = "3.13.3", arch = "ARM64" },
|
||||
{ identifier = "cp313t-win_arm64", version = "3.13.3", arch = "ARM64" },
|
||||
{ identifier = "cp314-win_arm64", version = "3.14.0-b1", arch = "ARM64" },
|
||||
{ identifier = "cp314t-win_arm64", version = "3.14.0-b1", arch = "ARM64" },
|
||||
{ identifier = "cp314-win_arm64", version = "3.14.0-b2", arch = "ARM64" },
|
||||
{ identifier = "cp314t-win_arm64", version = "3.14.0-b2", arch = "ARM64" },
|
||||
{ identifier = "pp38-win_amd64", version = "3.8", arch = "64", url = "https://downloads.python.org/pypy/pypy3.8-v7.3.11-win64.zip" },
|
||||
{ identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.16-win64.zip" },
|
||||
{ identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.19-win64.zip" },
|
||||
|
||||
@@ -89,7 +89,7 @@ shellingham==1.5.4
|
||||
# via typer
|
||||
sniffio==1.3.1
|
||||
# via anyio
|
||||
typer==0.15.4
|
||||
typer==0.16.0
|
||||
# via
|
||||
# auditwheel-emscripten
|
||||
# pyodide-build
|
||||
|
||||
@@ -30,5 +30,5 @@ typing-extensions==4.13.2
|
||||
# via delocate
|
||||
virtualenv==20.31.2
|
||||
# via -r cibuildwheel/resources/constraints.in
|
||||
zipp==3.21.0
|
||||
zipp==3.22.0
|
||||
# via importlib-metadata
|
||||
|
||||
@@ -30,5 +30,5 @@ typing-extensions==4.13.2
|
||||
# via delocate
|
||||
virtualenv==20.31.2
|
||||
# via -r cibuildwheel/resources/constraints.in
|
||||
zipp==3.21.0
|
||||
zipp==3.22.0
|
||||
# via importlib-metadata
|
||||
|
||||
@@ -1,47 +1,47 @@
|
||||
[x86_64]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.24-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.24-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.24-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.28-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.28-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2025.05.28-1
|
||||
|
||||
[i686]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.24-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.28-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2025.05.28-1
|
||||
|
||||
[aarch64]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.24-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.24-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.24-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.28-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.28-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2025.05.28-1
|
||||
|
||||
[ppc64le]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.24-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.24-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.24-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2025.05.28-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2025.05.28-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_ppc64le:2025.05.28-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2025.05.28-1
|
||||
|
||||
[s390x]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.24-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.24-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.24-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2025.05.28-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2025.05.28-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_s390x:2025.05.28-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2025.05.28-1
|
||||
|
||||
[pypy_x86_64]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.24-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.24-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2025.05.28-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2025.05.28-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_x86_64:2025.05.28-1
|
||||
|
||||
[pypy_i686]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_i686:2025.05.28-1
|
||||
|
||||
[pypy_aarch64]
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.24-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.24-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.24-1
|
||||
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2025.05.28-1
|
||||
manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2025.05.28-1
|
||||
manylinux_2_34 = quay.io/pypa/manylinux_2_34_aarch64:2025.05.28-1
|
||||
|
||||
[armv7l]
|
||||
manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.24-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.24-1
|
||||
manylinux_2_31 = quay.io/pypa/manylinux_2_31_armv7l:2025.05.28-1
|
||||
musllinux_1_2 = quay.io/pypa/musllinux_1_2_armv7l:2025.05.28-1
|
||||
|
||||
[riscv64]
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import textwrap
|
||||
|
||||
import packaging.utils
|
||||
import pytest
|
||||
|
||||
from cibuildwheel.logger import Logger
|
||||
@@ -37,7 +38,9 @@ def test(tmp_path, build_frontend_env, capfd):
|
||||
|
||||
# check that the expected wheels are produced
|
||||
expected_wheels = utils.expected_wheels("spam", "0.1.0")
|
||||
assert set(actual_wheels) == set(expected_wheels)
|
||||
actual_wheels_normalized = {packaging.utils.parse_wheel_filename(w) for w in actual_wheels}
|
||||
expected_wheels_normalized = {packaging.utils.parse_wheel_filename(w) for w in expected_wheels}
|
||||
assert actual_wheels_normalized == expected_wheels_normalized
|
||||
|
||||
enable_groups = utils.get_enable_groups()
|
||||
if EnableGroup.GraalPy not in enable_groups:
|
||||
|
||||
@@ -95,7 +95,7 @@ def test(manylinux_image, tmp_path):
|
||||
actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
|
||||
|
||||
platform_tag_map = {
|
||||
"manylinux2014": ["manylinux_2_17", "manylinux2014"],
|
||||
"manylinux2014": ["manylinux2014", "manylinux_2_17"],
|
||||
}
|
||||
expected_wheels = utils.expected_wheels(
|
||||
"spam",
|
||||
|
||||
+4
-4
@@ -250,11 +250,11 @@ def _expected_wheels(
|
||||
|
||||
if manylinux_versions is None:
|
||||
manylinux_versions = {
|
||||
"armv7l": ["manylinux_2_17", "manylinux2014", "manylinux_2_31"],
|
||||
"i686": ["manylinux_2_5", "manylinux1", "manylinux_2_17", "manylinux2014"],
|
||||
"x86_64": ["manylinux_2_5", "manylinux1", "manylinux_2_28"],
|
||||
"armv7l": ["manylinux2014", "manylinux_2_17", "manylinux_2_31"],
|
||||
"i686": ["manylinux1", "manylinux2014", "manylinux_2_17", "manylinux_2_5"],
|
||||
"x86_64": ["manylinux1", "manylinux_2_28", "manylinux_2_5"],
|
||||
"riscv64": ["manylinux_2_31", "manylinux_2_35"],
|
||||
}.get(machine_arch, ["manylinux_2_17", "manylinux2014", "manylinux_2_28"])
|
||||
}.get(machine_arch, ["manylinux2014", "manylinux_2_17", "manylinux_2_28"])
|
||||
|
||||
if musllinux_versions is None:
|
||||
musllinux_versions = ["musllinux_1_2"]
|
||||
|
||||
Reference in New Issue
Block a user