From fd11286290a46d09f484ded0a3636655279a5f31 Mon Sep 17 00:00:00 2001 From: "cibuildwheel-bot[bot]" <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:32:22 -0400 Subject: [PATCH] [Bot] Update dependencies (#1998) * Update dependencies * fix: set minimal deployment target to macOS 10.13 with CPython 3.12 --------- Co-authored-by: cibuildwheel-bot[bot] <83877280+cibuildwheel-bot[bot]@users.noreply.github.com> Co-authored-by: mayeut --- cibuildwheel/macos.py | 4 +- cibuildwheel/resources/build-platforms.toml | 36 +++++++------- .../resources/constraints-pyodide312.txt | 18 +++---- .../resources/constraints-python310.txt | 8 ++-- .../resources/constraints-python311.txt | 8 ++-- .../resources/constraints-python312.txt | 8 ++-- .../resources/constraints-python313.txt | 8 ++-- .../resources/constraints-python37.txt | 2 +- .../resources/constraints-python38.txt | 8 ++-- .../resources/constraints-python39.txt | 8 ++-- cibuildwheel/resources/constraints.txt | 8 ++-- .../resources/pinned_docker_images.cfg | 48 +++++++++---------- cibuildwheel/resources/virtualenv.toml | 2 +- docs/working-examples.md | 4 +- test/utils.py | 30 ++++++------ 15 files changed, 102 insertions(+), 98 deletions(-) diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 75be2023b..63e7296b4 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -294,10 +294,10 @@ def setup_python( # Set MACOSX_DEPLOYMENT_TARGET, if the user didn't set it. # For arm64, the minimal deployment target is 11.0. # On x86_64 (or universal2), use 10.9 as a default. - # CPython 3.13 needs 10.13. + # CPython 3.12.6+ needs 10.13. if config_is_arm64: default_target = "11.0" - elif Version(python_configuration.version) >= Version("3.13"): + elif Version(python_configuration.version) >= Version("3.12"): default_target = "10.13" elif python_configuration.identifier.startswith("pp") and Version( python_configuration.version diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index f96e6897a..2c8e1e5c1 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -120,15 +120,15 @@ python_configurations = [ { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" }, { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" }, { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.9/python-3.11.9-macos11.pkg" }, - { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.5/python-3.12.5-macos11.pkg" }, - { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.5/python-3.12.5-macos11.pkg" }, - { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.5/python-3.12.5-macos11.pkg" }, - { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc1-macos11.pkg" }, - { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc1-macos11.pkg" }, - { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc1-macos11.pkg" }, - { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc1-macos11.pkg" }, - { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc1-macos11.pkg" }, - { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc1-macos11.pkg" }, + { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.6/python-3.12.6-macos11.pkg" }, + { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.6/python-3.12.6-macos11.pkg" }, + { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.6/python-3.12.6-macos11.pkg" }, + { identifier = "cp313-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg" }, + { identifier = "cp313-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg" }, + { identifier = "cp313-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg" }, + { identifier = "cp313t-macosx_x86_64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg" }, + { identifier = "cp313t-macosx_arm64", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg" }, + { identifier = "cp313t-macosx_universal2", version = "3.13", url = "https://www.python.org/ftp/python/3.13.0/python-3.13.0rc2-macos11.pkg" }, { identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-osx64.tar.bz2" }, { 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" }, @@ -152,18 +152,18 @@ python_configurations = [ { identifier = "cp310-win_amd64", version = "3.10.11", arch = "64" }, { identifier = "cp311-win32", version = "3.11.9", arch = "32" }, { identifier = "cp311-win_amd64", version = "3.11.9", arch = "64" }, - { identifier = "cp312-win32", version = "3.12.5", arch = "32" }, - { identifier = "cp312-win_amd64", version = "3.12.5", arch = "64" }, - { identifier = "cp313-win32", version = "3.13.0-rc1", arch = "32" }, - { identifier = "cp313t-win32", version = "3.13.0-rc1", arch = "32" }, - { identifier = "cp313-win_amd64", version = "3.13.0-rc1", arch = "64" }, - { identifier = "cp313t-win_amd64", version = "3.13.0-rc1", arch = "64" }, + { identifier = "cp312-win32", version = "3.12.6", arch = "32" }, + { identifier = "cp312-win_amd64", version = "3.12.6", arch = "64" }, + { identifier = "cp313-win32", version = "3.13.0-rc2", arch = "32" }, + { identifier = "cp313t-win32", version = "3.13.0-rc2", arch = "32" }, + { identifier = "cp313-win_amd64", version = "3.13.0-rc2", arch = "64" }, + { identifier = "cp313t-win_amd64", version = "3.13.0-rc2", 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.5", arch = "ARM64" }, - { identifier = "cp313-win_arm64", version = "3.13.0-rc1", arch = "ARM64" }, - { identifier = "cp313t-win_arm64", version = "3.13.0-rc1", arch = "ARM64" }, + { identifier = "cp312-win_arm64", version = "3.12.6", arch = "ARM64" }, + { identifier = "cp313-win_arm64", version = "3.13.0-rc2", arch = "ARM64" }, + { identifier = "cp313t-win_arm64", version = "3.13.0-rc2", arch = "ARM64" }, { identifier = "pp37-win_amd64", version = "3.7", arch = "64", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.9-win64.zip" }, { 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" }, diff --git a/cibuildwheel/resources/constraints-pyodide312.txt b/cibuildwheel/resources/constraints-pyodide312.txt index 890a0736e..ff9665795 100644 --- a/cibuildwheel/resources/constraints-pyodide312.txt +++ b/cibuildwheel/resources/constraints-pyodide312.txt @@ -6,7 +6,7 @@ anyio==4.4.0 # via httpx auditwheel-emscripten==0.0.16 # via pyodide-build -build==1.2.1 +build==1.2.2 # via # -r .nox/update_constraints/tmp/constraints-pyodide.in # pyodide-build @@ -21,11 +21,11 @@ click==8.1.7 # via typer cloudpickle==3.0.0 # via loky -cmake==3.30.2 +cmake==3.30.3 # via pyodide-build distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv h11==0.14.0 # via httpcore @@ -54,13 +54,13 @@ packaging==24.1 # unearth pip==24.2 # via -r .nox/update_constraints/tmp/constraints-pyodide.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv -pydantic==2.8.2 +pydantic==2.9.0 # via # pyodide-build # pyodide-lock -pydantic-core==2.20.1 +pydantic-core==2.23.2 # via pydantic pygments==2.18.0 # via rich @@ -100,20 +100,22 @@ typer==0.12.5 # auditwheel-emscripten # pyodide-build # pyodide-cli -types-requests==2.32.0.20240712 +types-requests==2.32.0.20240907 # via pyodide-build typing-extensions==4.12.2 # via # pydantic # pydantic-core # typer +tzdata==2024.1 + # via pydantic unearth==0.17.2 # via pyodide-build urllib3==2.2.2 # via # requests # types-requests -virtualenv==20.26.3 +virtualenv==20.26.4 # via # build # pyodide-build diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 33aae57f4..ac32501da 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -2,13 +2,13 @@ # nox -s update_constraints altgraph==0.17.4 # via macholib -build==1.2.1 +build==1.2.2 # via -r cibuildwheel/resources/constraints.in delocate==0.12.0 # via -r cibuildwheel/resources/constraints.in distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv importlib-metadata==8.4.0 # via build @@ -20,7 +20,7 @@ packaging==24.1 # delocate pip==24.2 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv pyproject-hooks==1.1.0 # via build @@ -28,7 +28,7 @@ tomli==2.0.1 # via build typing-extensions==4.12.2 # via delocate -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in zipp==3.20.1 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index 4218df02e..805c0fdad 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -2,13 +2,13 @@ # nox -s update_constraints altgraph==0.17.4 # via macholib -build==1.2.1 +build==1.2.2 # via -r cibuildwheel/resources/constraints.in delocate==0.12.0 # via -r cibuildwheel/resources/constraints.in distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv macholib==1.16.3 # via delocate @@ -18,11 +18,11 @@ packaging==24.1 # delocate pip==24.2 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv pyproject-hooks==1.1.0 # via build typing-extensions==4.12.2 # via delocate -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index 4218df02e..805c0fdad 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -2,13 +2,13 @@ # nox -s update_constraints altgraph==0.17.4 # via macholib -build==1.2.1 +build==1.2.2 # via -r cibuildwheel/resources/constraints.in delocate==0.12.0 # via -r cibuildwheel/resources/constraints.in distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv macholib==1.16.3 # via delocate @@ -18,11 +18,11 @@ packaging==24.1 # delocate pip==24.2 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv pyproject-hooks==1.1.0 # via build typing-extensions==4.12.2 # via delocate -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python313.txt b/cibuildwheel/resources/constraints-python313.txt index 4218df02e..805c0fdad 100644 --- a/cibuildwheel/resources/constraints-python313.txt +++ b/cibuildwheel/resources/constraints-python313.txt @@ -2,13 +2,13 @@ # nox -s update_constraints altgraph==0.17.4 # via macholib -build==1.2.1 +build==1.2.2 # via -r cibuildwheel/resources/constraints.in delocate==0.12.0 # via -r cibuildwheel/resources/constraints.in distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv macholib==1.16.3 # via delocate @@ -18,11 +18,11 @@ packaging==24.1 # delocate pip==24.2 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv pyproject-hooks==1.1.0 # via build typing-extensions==4.12.2 # via delocate -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index 21f0e7449..7198fa8d3 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -33,7 +33,7 @@ typing-extensions==4.7.1 # delocate # importlib-metadata # platformdirs -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in zipp==3.15.0 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index 33aae57f4..ac32501da 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -2,13 +2,13 @@ # nox -s update_constraints altgraph==0.17.4 # via macholib -build==1.2.1 +build==1.2.2 # via -r cibuildwheel/resources/constraints.in delocate==0.12.0 # via -r cibuildwheel/resources/constraints.in distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv importlib-metadata==8.4.0 # via build @@ -20,7 +20,7 @@ packaging==24.1 # delocate pip==24.2 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv pyproject-hooks==1.1.0 # via build @@ -28,7 +28,7 @@ tomli==2.0.1 # via build typing-extensions==4.12.2 # via delocate -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in zipp==3.20.1 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 33aae57f4..ac32501da 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -2,13 +2,13 @@ # nox -s update_constraints altgraph==0.17.4 # via macholib -build==1.2.1 +build==1.2.2 # via -r cibuildwheel/resources/constraints.in delocate==0.12.0 # via -r cibuildwheel/resources/constraints.in distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv importlib-metadata==8.4.0 # via build @@ -20,7 +20,7 @@ packaging==24.1 # delocate pip==24.2 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv pyproject-hooks==1.1.0 # via build @@ -28,7 +28,7 @@ tomli==2.0.1 # via build typing-extensions==4.12.2 # via delocate -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in zipp==3.20.1 # via importlib-metadata diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 4218df02e..805c0fdad 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -2,13 +2,13 @@ # nox -s update_constraints altgraph==0.17.4 # via macholib -build==1.2.1 +build==1.2.2 # via -r cibuildwheel/resources/constraints.in delocate==0.12.0 # via -r cibuildwheel/resources/constraints.in distlib==0.3.8 # via virtualenv -filelock==3.15.4 +filelock==3.16.0 # via virtualenv macholib==1.16.3 # via delocate @@ -18,11 +18,11 @@ packaging==24.1 # delocate pip==24.2 # via -r cibuildwheel/resources/constraints.in -platformdirs==4.2.2 +platformdirs==4.3.2 # via virtualenv pyproject-hooks==1.1.0 # via build typing-extensions==4.12.2 # via delocate -virtualenv==20.26.3 +virtualenv==20.26.4 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 0546e6fbf..c21d26f73 100644 --- a/cibuildwheel/resources/pinned_docker_images.cfg +++ b/cibuildwheel/resources/pinned_docker_images.cfg @@ -1,54 +1,54 @@ [x86_64] manylinux1 = quay.io/pypa/manylinux1_x86_64:2024-04-29-76807b8 manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024.09.01-2 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2024.09.01-2 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2024.09.01-2 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024.09.09-0 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2024.09.09-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2024.09.09-0 [i686] manylinux1 = quay.io/pypa/manylinux1_i686:2024-04-29-76807b8 manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2024.09.01-2 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2024.09.01-2 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2024.09.09-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2024.09.09-0 [pypy_x86_64] manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_x86_64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024.09.01-2 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024.09.09-0 [pypy_i686] manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024.09.01-2 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2024.09.01-2 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2024.09.01-2 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024.09.09-0 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2024.09.09-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2024.09.09-0 [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2024.09.01-2 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2024.09.01-2 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2024.09.01-2 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2024.09.09-0 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2024.09.09-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2024.09.09-0 [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2024.09.01-2 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2024.09.01-2 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2024.09.01-2 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2024.09.09-0 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2024.09.09-0 +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2024.09.09-0 [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024.09.01-2 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024.09.09-0 manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024.09.01-2 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024.09.09-0 diff --git a/cibuildwheel/resources/virtualenv.toml b/cibuildwheel/resources/virtualenv.toml index 2c886b954..b29f2fe8e 100644 --- a/cibuildwheel/resources/virtualenv.toml +++ b/cibuildwheel/resources/virtualenv.toml @@ -1,2 +1,2 @@ py36 = { version = "20.21.1", url = "https://github.com/pypa/get-virtualenv/blob/20.21.1/public/virtualenv.pyz?raw=true" } -default = { version = "20.26.3", url = "https://github.com/pypa/get-virtualenv/blob/20.26.3/public/virtualenv.pyz?raw=true" } +default = { version = "20.26.4", url = "https://github.com/pypa/get-virtualenv/blob/20.26.4/public/virtualenv.pyz?raw=true" } diff --git a/docs/working-examples.md b/docs/working-examples.md index 6d3d9cdd7..327358b90 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -103,8 +103,8 @@ title: Working examples | [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | | [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | -| [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions | | [Confluent client for Kafka][] | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` | +| [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions | | [ninja][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Multitagged binary builds for all supported platforms, using cibw 2 config configuration. | | [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | | [pyjet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The interface between FastJet and NumPy | @@ -213,8 +213,8 @@ title: Working examples [polaroid]: https://github.com/daggy1234/polaroid [clang-format]: https://github.com/ssciwr/clang-format-wheel [etebase-py]: https://github.com/etesync/etebase-py -[cf-units]: https://github.com/SciTools/cf-units [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python +[cf-units]: https://github.com/SciTools/cf-units [ninja]: https://github.com/scikit-build/ninja-python-distributions [numpythia]: https://github.com/scikit-hep/numpythia [pyjet]: https://github.com/scikit-hep/pyjet diff --git a/test/utils.py b/test/utils.py index fbf4d17ee..158527e81 100644 --- a/test/utils.py +++ b/test/utils.py @@ -274,25 +274,27 @@ def expected_wheels( platform_tags = ["win32", "win_amd64"] elif platform == "macos": + if python_abi_tag.startswith("pp"): + if python_abi_tag.startswith(("pp37", "pp38")): + min_macosx = macosx_deployment_target + else: + min_macosx = _floor_macosx(macosx_deployment_target, "10.15") + elif python_abi_tag.startswith("cp"): + if python_abi_tag.startswith(("cp36", "cp37", "cp38", "cp39", "cp310", "cp311")): + min_macosx = macosx_deployment_target + else: + min_macosx = _floor_macosx(macosx_deployment_target, "10.13") + else: + min_macosx = macosx_deployment_target + if machine_arch == "arm64": - arm64_macosx = _floor_macosx(macosx_deployment_target, "11.0") + arm64_macosx = _floor_macosx(min_macosx, "11.0") platform_tags = [f'macosx_{arm64_macosx.replace(".", "_")}_arm64'] else: - if python_abi_tag.startswith("pp") and not python_abi_tag.startswith( - ("pp37", "pp38") - ): - pypy_macosx = _floor_macosx(macosx_deployment_target, "10.15") - platform_tags = [f'macosx_{pypy_macosx.replace(".", "_")}_x86_64'] - elif python_abi_tag.startswith("cp313"): - pypy_macosx = _floor_macosx(macosx_deployment_target, "10.13") - platform_tags = [f'macosx_{pypy_macosx.replace(".", "_")}_x86_64'] - else: - platform_tags = [f'macosx_{macosx_deployment_target.replace(".", "_")}_x86_64'] + platform_tags = [f'macosx_{min_macosx.replace(".", "_")}_x86_64'] if include_universal2: - platform_tags.append( - f'macosx_{macosx_deployment_target.replace(".", "_")}_universal2', - ) + platform_tags.append(f'macosx_{min_macosx.replace(".", "_")}_universal2') else: msg = f"Unsupported platform {platform!r}" raise Exception(msg)