diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6fddca0d..6c4b3695 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,3 +5,7 @@ updates: directory: "/" schedule: interval: "weekly" + groups: + actions: + patterns: + - "*" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db3bd2b0..5843a387 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,8 +16,9 @@ jobs: - name: Build SDist and wheel run: pipx run build - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-sdist path: dist/* - name: Check metadata @@ -32,9 +33,10 @@ jobs: id-token: write steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: artifact + pattern: cibw-* path: dist + merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf23cfcd..04b39847 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - uses: pre-commit/action@v3.0.0 @@ -46,7 +46,7 @@ jobs: timeout-minutes: 180 steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 name: Install Python ${{ matrix.python_version }} with: python-version: ${{ matrix.python_version }} @@ -85,10 +85,10 @@ jobs: env: CIBW_ARCHS_MACOS: x86_64 universal2 arm64 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: sample_wheels_action - path: wheelhouse + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} + path: wheelhouse/*.whl - name: Test cibuildwheel run: | @@ -101,7 +101,7 @@ jobs: timeout-minutes: 180 steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.x" - name: Install dependencies diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ab46138e..4c00c750 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.5 + rev: v0.1.14 hooks: - id: ruff args: ["--fix", "--show-fixes"] @@ -27,7 +27,7 @@ repos: args: [--include-version-classifiers, --min-py-version=3.8, --max-py-version=3.12] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.7.0 + rev: v1.8.0 hooks: - id: mypy name: mypy 3.8 on cibuildwheel/ @@ -79,3 +79,20 @@ repos: - id: codespell args: ["-L", "sur", "-w"] exclude: ^docs/working-examples\.md$ # Autogenerated + + +- repo: https://github.com/python-jsonschema/check-jsonschema + rev: 0.27.0 + hooks: + - id: check-dependabot + - id: check-github-actions + - id: check-github-workflows + - id: check-gitlab-ci + - id: check-readthedocs + - id: check-travis + - id: check-jsonschema + name: Check projects + args: [--schemafile, docs/data/projects.schema.json] + files: '^docs/data/projects.yml$' + - id: check-metaschema + files: '^docs/data/projects.schema.json$' diff --git a/LICENSE b/LICENSE index e9b2ceee..3fd8bcc6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ This project is licensed under the 'BSD 2-clause license'. -Copyright (c) 2017-2019, Joe Rickerby and contributors. All rights reserved. +Copyright (c) 2017-2023, Joe Rickerby and contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 05bf7ef5..69532aaf 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ cibuildwheel [![Appveyor status](https://ci.appveyor.com/api/projects/status/gt3vwl88yt0y3hur/branch/main?svg=true)](https://ci.appveyor.com/project/joerick/cibuildwheel/branch/main) [![CircleCI Status](https://img.shields.io/circleci/build/gh/pypa/cibuildwheel/main?logo=circleci)](https://circleci.com/gh/pypa/cibuildwheel) [![Azure Status](https://dev.azure.com/joerick0429/cibuildwheel/_apis/build/status/pypa.cibuildwheel?branchName=main)](https://dev.azure.com/joerick0429/cibuildwheel/_build/latest?definitionId=4&branchName=main) -[![Cirrus CI Status](https://img.shields.io/cirrus/github/pypa/cibuildwheel/main?logo=cirrusci)](https://cirrus-ci.com/github/pypa/cibuildwheel) [Documentation](https://cibuildwheel.readthedocs.org) @@ -97,7 +96,7 @@ jobs: - uses: actions/setup-python@v3 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.16.2 + run: python -m pip install cibuildwheel==2.16.5 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -105,8 +104,9 @@ jobs: # env: # CIBW_SOME_OPTION: value - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl ``` @@ -213,6 +213,27 @@ Changelog +### v2.16.5 + +_30 January 2024_ + +- 🐛 Fix an incompatibility with the GitHub Action and new GitHub Runner images for Windows that bundle Powershell 7.3+ (#1741) +- 🛠 Preliminary support for new `macos-14` arm64 runners (#1743) + +### v2.16.4 + +_28 January 2024_ + +- 🛠 Update manylinux pins to upgrade from a problematic PyPy version. (#1737) + +### v2.16.3 + +_26 January 2024_ + +- 🐛 Fix a bug when building from sdist, where relative paths to files in the package didn't work because the working directory was wrong (#1687) +- 🛠 Adds the ability to disable mounting the host filesystem in containers to `/host`, through the `disable_host_mount` suboption on [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine). +- 📚 A lot of docs improvements! (#1708, #1705, #1686, #1679, #1667, #1665) + ### v2.16.2 _3 October 2023_ @@ -231,31 +252,6 @@ _26 September 2023_ - 🛠 Updates the prerelease CPython 3.12 version to 3.12.0rc3 (#1625) - 🛠 Only calls `linux32` in containers when necessary (#1599) -### v2.16.0 - -_18 September 2023_ - -- ✨ Add the ability to pass additional flags to a build frontend through the [CIBW_BUILD_FRONTEND](https://cibuildwheel.readthedocs.io/en/stable/options/#build-frontend) option (#1588). -- ✨ The environment variable SOURCE_DATE_EPOCH is now automatically passed through to container Linux builds (useful for [reproducible builds](https://reproducible-builds.org/docs/source-date-epoch/)!) (#1589) -- 🛠 Updates the prerelease CPython 3.12 version to 3.12.0rc2 (#1604) -- 🐛 Fix `requires_python` auto-detection from setup.py when the call to `setup()` is within an `if __name__ == "__main__"` block (#1613) -- 🐛 Fix a bug that prevented building Linux wheels in Docker on a Windows host (#1573) -- 🐛 `--only` can now select prerelease-pythons (#1564) -- 📚 Docs & examples updates (#1582, #1593, #1598, #1615) - -### v2.15.0 - -_8 August 2023_ - -- 🌟 CPython 3.12 wheels are now built by default - without the CIBW_PRERELEASE_PYTHONS flag. It's time to build and upload these wheels to PyPI! This release includes CPython 3.12.0rc1, which is guaranteed to be ABI compatible with the final release. (#1565) -- ✨ Adds musllinux_1_2 support - this allows packagers to build for musl-based Linux distributions on a more recent Alpine image, and a newer musl libc. (#1561) - -### v2.14.1 - -_15 July 2023_ - -- 🛠 Updates the prerelease CPython 3.12 version to 3.12.0b4 (#1550) - --- diff --git a/action.yml b/action.yml index 00534f32..77b360c4 100644 --- a/action.yml +++ b/action.yml @@ -25,16 +25,20 @@ runs: using: composite steps: # Set up a non-EOL, cibuildwheel & pipx supported Python version - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 id: python with: python-version: "3.8 - 3.12" update-environment: false + # macos-14 (M1) may be missing pipx (due to it not having CPython) + - run: | + "${{ steps.python.outputs.python-path }}" -m pip install pipx + shell: bash + # Redirecting stderr to stdout to fix interleaving issue in Actions. - run: > - pipx run - --python '${{ steps.python.outputs.python-path }}' + "${{ steps.python.outputs.python-path }}" -m pipx run --spec '${{ github.action_path }}' cibuildwheel "${{ inputs.package-dir }}" @@ -46,9 +50,14 @@ runs: if: runner.os != 'Windows' # Windows needs powershell to interact nicely with Meson + # $PSNativeCommandArgumentPassing was introduced in pwsh 7.3 and the + # legacy behaviour is needed for backwards compatibility with how this + # was called in the past. - run: > - pipx run - --python "${{ steps.python.outputs.python-path }}" + if ($PSNativeCommandArgumentPassing) { + $PSNativeCommandArgumentPassing = 'Legacy' + }; + & "${{ steps.python.outputs.python-path }}" -m pipx run --spec "${{ github.action_path }}" cibuildwheel "${{ inputs.package-dir }}" diff --git a/bin/generate_schema.py b/bin/generate_schema.py index 85f0743e..08680b83 100755 --- a/bin/generate_schema.py +++ b/bin/generate_schema.py @@ -66,9 +66,9 @@ properties: oneOf: - enum: [docker, podman] - type: string - pattern: '^docker; ?create_args:' + pattern: '^docker; ?(create_args|disable_host_mount):' - type: string - pattern: '^podman; ?create_args:' + pattern: '^podman; ?(create_args|disable_host_mount):' - type: object additionalProperties: false required: [name] @@ -79,6 +79,8 @@ properties: type: array items: type: string + disable-host-mount: + type: boolean dependency-versions: default: pinned description: Specify how cibuildwheel controls the versions of the tools it uses diff --git a/cibuildwheel/__init__.py b/cibuildwheel/__init__.py index 9441fbdc..2bf43dda 100644 --- a/cibuildwheel/__init__.py +++ b/cibuildwheel/__init__.py @@ -1,3 +1,3 @@ from __future__ import annotations -__version__ = "2.16.2" +__version__ = "2.16.5" diff --git a/cibuildwheel/__main__.py b/cibuildwheel/__main__.py index c6a2fdea..03b47144 100644 --- a/cibuildwheel/__main__.py +++ b/cibuildwheel/__main__.py @@ -160,7 +160,7 @@ def main() -> None: # This is now the new package dir args.package_dir = project_dir.resolve() - with chdir(temp_dir): + with chdir(project_dir): build_in_directory(args) finally: # avoid https://github.com/python/cpython/issues/86962 by performing diff --git a/cibuildwheel/extra.py b/cibuildwheel/extra.py index a87ddfbd..9e8ae8ec 100644 --- a/cibuildwheel/extra.py +++ b/cibuildwheel/extra.py @@ -17,7 +17,7 @@ class Printable(Protocol): def dump_python_configurations( - inp: Mapping[str, Mapping[str, Sequence[Mapping[str, Printable]]]] + inp: Mapping[str, Mapping[str, Sequence[Mapping[str, Printable]]]], ) -> str: output = StringIO() for header, values in inp.items(): diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py index 07d1bf95..79eb7bf5 100644 --- a/cibuildwheel/macos.py +++ b/cibuildwheel/macos.py @@ -493,7 +493,7 @@ def build(options: Options, tmp_path: Path) -> None: tested. The ability to test the arm64 wheels will be added in a future release of cibuildwheel, once Apple Silicon CI runners are widely available. To silence this warning, set - `CIBW_TEST_SKIP: *-macosx_arm64`. + `CIBW_TEST_SKIP: "*-macosx_arm64"`. """ ) ) @@ -506,7 +506,7 @@ def build(options: Options, tmp_path: Path) -> None: arm64 part of a universal2 wheel will be added in a future release of cibuildwheel, once Apple Silicon CI runners are widely available. To silence this warning, set - `CIBW_TEST_SKIP: *-macosx_universal2:arm64`. + `CIBW_TEST_SKIP: "*-macosx_universal2:arm64"`. """ ) ) @@ -527,7 +527,7 @@ def build(options: Options, tmp_path: Path) -> None: Silicon machine. This is because we use the x86_64 installer of CPython 3.8. See the discussion in https://github.com/pypa/cibuildwheel/pull/1169 for the details. To - silence this warning, set `CIBW_TEST_SKIP: cp38-macosx_*:arm64`. + silence this warning, set `CIBW_TEST_SKIP: "cp38-macosx_*:arm64"`. """ ) ) @@ -545,7 +545,7 @@ def build(options: Options, tmp_path: Path) -> None: # there are no dependencies that were pulled in at build time. call("pip", "install", "virtualenv", *dependency_constraint_flags, env=env) - venv_dir = identifier_tmp_dir / "venv-test" + venv_dir = identifier_tmp_dir / f"venv-test-{testing_arch}" arch_prefix = [] if testing_arch != machine_arch: diff --git a/cibuildwheel/oci_container.py b/cibuildwheel/oci_container.py index 3111ff95..ea21e8a2 100644 --- a/cibuildwheel/oci_container.py +++ b/cibuildwheel/oci_container.py @@ -33,11 +33,14 @@ ContainerEngineName = Literal["docker", "podman"] class OCIContainerEngineConfig: name: ContainerEngineName create_args: Sequence[str] = () + disable_host_mount: bool = False @staticmethod def from_config_string(config_string: str) -> OCIContainerEngineConfig: config_dict = parse_key_value_string( - config_string, ["name"], ["create_args", "create-args"] + config_string, + ["name"], + ["create_args", "create-args", "disable_host_mount", "disable-host-mount"], ) name = " ".join(config_dict["name"]) if name not in {"docker", "podman"}: @@ -45,15 +48,28 @@ class OCIContainerEngineConfig: raise ValueError(msg) name = typing.cast(ContainerEngineName, name) - # some flexibility in the option name to cope with TOML conventions + # some flexibility in the option names to cope with TOML conventions create_args = config_dict.get("create_args") or config_dict.get("create-args") or [] - return OCIContainerEngineConfig(name=name, create_args=create_args) + disable_host_mount_options = ( + config_dict.get("disable_host_mount") or config_dict.get("disable-host-mount") or [] + ) + disable_host_mount = ( + strtobool(disable_host_mount_options[-1]) if disable_host_mount_options else False + ) + + return OCIContainerEngineConfig( + name=name, create_args=create_args, disable_host_mount=disable_host_mount + ) def options_summary(self) -> str | dict[str, str]: if not self.create_args: return self.name else: - return {"name": self.name, "create_args": repr(self.create_args)} + return { + "name": self.name, + "create_args": repr(self.create_args), + "disable_host_mount": str(self.disable_host_mount), + } DEFAULT_ENGINE = OCIContainerEngineConfig("docker") @@ -137,7 +153,7 @@ class OCIContainer: "--env=SOURCE_DATE_EPOCH", f"--name={self.name}", "--interactive", - "--volume=/:/host", # ignored on CircleCI + *(["--volume=/:/host"] if not self.engine.disable_host_mount else []), *network_args, *self.engine.create_args, self.image, diff --git a/cibuildwheel/options.py b/cibuildwheel/options.py index f5664cbf..418b19f5 100644 --- a/cibuildwheel/options.py +++ b/cibuildwheel/options.py @@ -378,6 +378,9 @@ def _inner_fmt(k: str, v: Any, table: TableFmt) -> Iterator[str]: for inner_v in v: qv = quote_function(inner_v) yield table["item"].format(k=k, v=qv) + elif isinstance(v, bool): + qv = quote_function(str(v)) + yield table["item"].format(k=k, v=qv) else: qv = quote_function(v) yield table["item"].format(k=k, v=qv) diff --git a/cibuildwheel/resources/build-platforms.toml b/cibuildwheel/resources/build-platforms.toml index b56ce40c..f561871b 100644 --- a/cibuildwheel/resources/build-platforms.toml +++ b/cibuildwheel/resources/build-platforms.toml @@ -97,19 +97,19 @@ python_configurations = [ { identifier = "cp310-macosx_x86_64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" }, { identifier = "cp310-macosx_arm64", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" }, { identifier = "cp310-macosx_universal2", version = "3.10", url = "https://www.python.org/ftp/python/3.10.11/python-3.10.11-macos11.pkg" }, - { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.6/python-3.11.6-macos11.pkg" }, - { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.6/python-3.11.6-macos11.pkg" }, - { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.6/python-3.11.6-macos11.pkg" }, - { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.0/python-3.12.0-macos11.pkg" }, - { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.0/python-3.12.0-macos11.pkg" }, - { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.0/python-3.12.0-macos11.pkg" }, + { identifier = "cp311-macosx_x86_64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.7/python-3.11.7-macos11.pkg" }, + { identifier = "cp311-macosx_arm64", version = "3.11", url = "https://www.python.org/ftp/python/3.11.7/python-3.11.7-macos11.pkg" }, + { identifier = "cp311-macosx_universal2", version = "3.11", url = "https://www.python.org/ftp/python/3.11.7/python-3.11.7-macos11.pkg" }, + { identifier = "cp312-macosx_x86_64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-macos11.pkg" }, + { identifier = "cp312-macosx_arm64", version = "3.12", url = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-macos11.pkg" }, + { identifier = "cp312-macosx_universal2", version = "3.12", url = "https://www.python.org/ftp/python/3.12.1/python-3.12.1-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" }, - { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.13-macos_x86_64.tar.bz2" }, - { identifier = "pp39-macosx_arm64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.13-macos_arm64.tar.bz2" }, - { identifier = "pp310-macosx_x86_64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.13-macos_x86_64.tar.bz2" }, - { identifier = "pp310-macosx_arm64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.13-macos_arm64.tar.bz2" }, + { identifier = "pp39-macosx_x86_64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.15-macos_x86_64.tar.bz2" }, + { identifier = "pp39-macosx_arm64", version = "3.9", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.15-macos_arm64.tar.bz2" }, + { identifier = "pp310-macosx_x86_64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.15-macos_x86_64.tar.bz2" }, + { identifier = "pp310-macosx_arm64", version = "3.10", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.15-macos_arm64.tar.bz2" }, ] [windows] @@ -124,16 +124,16 @@ python_configurations = [ { identifier = "cp39-win_amd64", version = "3.9.13", arch = "64" }, { identifier = "cp310-win32", version = "3.10.11", arch = "32" }, { identifier = "cp310-win_amd64", version = "3.10.11", arch = "64" }, - { identifier = "cp311-win32", version = "3.11.6", arch = "32" }, - { identifier = "cp311-win_amd64", version = "3.11.6", arch = "64" }, - { identifier = "cp312-win32", version = "3.12.0", arch = "32" }, - { identifier = "cp312-win_amd64", version = "3.12.0", arch = "64" }, + { identifier = "cp311-win32", version = "3.11.7", arch = "32" }, + { identifier = "cp311-win_amd64", version = "3.11.7", arch = "64" }, + { identifier = "cp312-win32", version = "3.12.1", arch = "32" }, + { identifier = "cp312-win_amd64", version = "3.12.1", 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.6", arch = "ARM64" }, - { identifier = "cp312-win_arm64", version = "3.12.0", arch = "ARM64" }, + { identifier = "cp311-win_arm64", version = "3.11.7", arch = "ARM64" }, + { identifier = "cp312-win_arm64", version = "3.12.1", 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.13-win64.zip" }, - { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.13-win64.zip" }, + { identifier = "pp39-win_amd64", version = "3.9", arch = "64", url = "https://downloads.python.org/pypy/pypy3.9-v7.3.15-win64.zip" }, + { identifier = "pp310-win_amd64", version = "3.10", arch = "64", url = "https://downloads.python.org/pypy/pypy3.10-v7.3.15-win64.zip" }, ] diff --git a/cibuildwheel/resources/cibuildwheel.schema.json b/cibuildwheel/resources/cibuildwheel.schema.json index bc693ef6..7e9c3901 100644 --- a/cibuildwheel/resources/cibuildwheel.schema.json +++ b/cibuildwheel/resources/cibuildwheel.schema.json @@ -172,11 +172,11 @@ }, { "type": "string", - "pattern": "^docker; ?create_args:" + "pattern": "^docker; ?(create_args|disable_host_mount):" }, { "type": "string", - "pattern": "^podman; ?create_args:" + "pattern": "^podman; ?(create_args|disable_host_mount):" }, { "type": "object", @@ -196,6 +196,9 @@ "items": { "type": "string" } + }, + "disable-host-mount": { + "type": "boolean" } } } diff --git a/cibuildwheel/resources/constraints-python310.txt b/cibuildwheel/resources/constraints-python310.txt index 71908f30..34c012bd 100644 --- a/cibuildwheel/resources/constraints-python310.txt +++ b/cibuildwheel/resources/constraints-python310.txt @@ -4,25 +4,25 @@ # # nox -s update_constraints-3.10 # -delocate==0.10.4 +delocate==0.10.7 # via -r cibuildwheel/resources/constraints.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via virtualenv packaging==23.2 # via delocate -platformdirs==3.11.0 +platformdirs==4.1.0 # via virtualenv -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via delocate -virtualenv==20.24.6 +virtualenv==20.25.0 # via -r cibuildwheel/resources/constraints.in -wheel==0.41.3 +wheel==0.42.0 # via -r cibuildwheel/resources/constraints.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r cibuildwheel/resources/constraints.in -setuptools==68.2.2 +setuptools==69.0.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python311.txt b/cibuildwheel/resources/constraints-python311.txt index 2aa70249..7d1e1b95 100644 --- a/cibuildwheel/resources/constraints-python311.txt +++ b/cibuildwheel/resources/constraints-python311.txt @@ -4,25 +4,25 @@ # # nox -s update_constraints-3.11 # -delocate==0.10.4 +delocate==0.10.7 # via -r cibuildwheel/resources/constraints.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via virtualenv packaging==23.2 # via delocate -platformdirs==3.11.0 +platformdirs==4.1.0 # via virtualenv -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via delocate -virtualenv==20.24.6 +virtualenv==20.25.0 # via -r cibuildwheel/resources/constraints.in -wheel==0.41.3 +wheel==0.42.0 # via -r cibuildwheel/resources/constraints.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r cibuildwheel/resources/constraints.in -setuptools==68.2.2 +setuptools==69.0.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python312.txt b/cibuildwheel/resources/constraints-python312.txt index 8dc060d2..75813c8c 100644 --- a/cibuildwheel/resources/constraints-python312.txt +++ b/cibuildwheel/resources/constraints-python312.txt @@ -4,25 +4,25 @@ # # nox -s update_constraints-3.12 # -delocate==0.10.4 +delocate==0.10.7 # via -r cibuildwheel/resources/constraints.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via virtualenv packaging==23.2 # via delocate -platformdirs==3.11.0 +platformdirs==4.1.0 # via virtualenv -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via delocate -virtualenv==20.24.6 +virtualenv==20.25.0 # via -r cibuildwheel/resources/constraints.in -wheel==0.41.3 +wheel==0.42.0 # via -r cibuildwheel/resources/constraints.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r cibuildwheel/resources/constraints.in -setuptools==68.2.2 +setuptools==69.0.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python37.txt b/cibuildwheel/resources/constraints-python37.txt index 159b0b70..77e85e37 100644 --- a/cibuildwheel/resources/constraints-python37.txt +++ b/cibuildwheel/resources/constraints-python37.txt @@ -4,9 +4,9 @@ # # nox -s update_constraints-3.7 # -delocate==0.10.4 +delocate==0.10.7 # via -r cibuildwheel/resources/constraints.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.12.2 # via virtualenv @@ -14,22 +14,22 @@ importlib-metadata==6.7.0 # via virtualenv packaging==23.2 # via delocate -platformdirs==3.11.0 +platformdirs==4.0.0 # via virtualenv typing-extensions==4.7.1 # via # delocate # importlib-metadata # platformdirs -virtualenv==20.24.6 +virtualenv==20.25.0 # via -r cibuildwheel/resources/constraints.in -wheel==0.41.3 +wheel==0.42.0 # via -r cibuildwheel/resources/constraints.in zipp==3.15.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r cibuildwheel/resources/constraints.in setuptools==68.0.0 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python38.txt b/cibuildwheel/resources/constraints-python38.txt index e807e228..3dc620a4 100644 --- a/cibuildwheel/resources/constraints-python38.txt +++ b/cibuildwheel/resources/constraints-python38.txt @@ -4,25 +4,25 @@ # # nox -s update_constraints-3.8 # -delocate==0.10.4 +delocate==0.10.7 # via -r cibuildwheel/resources/constraints.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via virtualenv packaging==23.2 # via delocate -platformdirs==3.11.0 +platformdirs==4.1.0 # via virtualenv -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via delocate -virtualenv==20.24.6 +virtualenv==20.25.0 # via -r cibuildwheel/resources/constraints.in -wheel==0.41.3 +wheel==0.42.0 # via -r cibuildwheel/resources/constraints.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r cibuildwheel/resources/constraints.in -setuptools==68.2.2 +setuptools==69.0.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints-python39.txt b/cibuildwheel/resources/constraints-python39.txt index 32910cf7..9c8819ca 100644 --- a/cibuildwheel/resources/constraints-python39.txt +++ b/cibuildwheel/resources/constraints-python39.txt @@ -4,25 +4,25 @@ # # nox -s update_constraints-3.9 # -delocate==0.10.4 +delocate==0.10.7 # via -r cibuildwheel/resources/constraints.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via virtualenv packaging==23.2 # via delocate -platformdirs==3.11.0 +platformdirs==4.1.0 # via virtualenv -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via delocate -virtualenv==20.24.6 +virtualenv==20.25.0 # via -r cibuildwheel/resources/constraints.in -wheel==0.41.3 +wheel==0.42.0 # via -r cibuildwheel/resources/constraints.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r cibuildwheel/resources/constraints.in -setuptools==68.2.2 +setuptools==69.0.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/constraints.txt b/cibuildwheel/resources/constraints.txt index 8dc060d2..75813c8c 100644 --- a/cibuildwheel/resources/constraints.txt +++ b/cibuildwheel/resources/constraints.txt @@ -4,25 +4,25 @@ # # nox -s update_constraints-3.12 # -delocate==0.10.4 +delocate==0.10.7 # via -r cibuildwheel/resources/constraints.in -distlib==0.3.7 +distlib==0.3.8 # via virtualenv filelock==3.13.1 # via virtualenv packaging==23.2 # via delocate -platformdirs==3.11.0 +platformdirs==4.1.0 # via virtualenv -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via delocate -virtualenv==20.24.6 +virtualenv==20.25.0 # via -r cibuildwheel/resources/constraints.in -wheel==0.41.3 +wheel==0.42.0 # via -r cibuildwheel/resources/constraints.in # The following packages are considered to be unsafe in a requirements file: -pip==23.3.1 +pip==23.3.2 # via -r cibuildwheel/resources/constraints.in -setuptools==68.2.2 +setuptools==69.0.3 # via -r cibuildwheel/resources/constraints.in diff --git a/cibuildwheel/resources/pinned_docker_images.cfg b/cibuildwheel/resources/pinned_docker_images.cfg index 10aac6a6..0178b6d7 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:2023-10-15-710807d +manylinux1 = quay.io/pypa/manylinux1_x86_64:2024-01-28-7b6687a manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024-01-23-12ffabc 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:2023-11-13-f6b0c51 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2023-11-13-f6b0c51 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2023-11-13-f6b0c51 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024-01-23-12ffabc +musllinux_1_1 = quay.io/pypa/musllinux_1_1_x86_64:2024-01-23-12ffabc +musllinux_1_2 = quay.io/pypa/musllinux_1_2_x86_64:2024-01-23-12ffabc [i686] -manylinux1 = quay.io/pypa/manylinux1_i686:2023-10-15-710807d +manylinux1 = quay.io/pypa/manylinux1_i686:2024-01-28-7b6687a manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2024-01-23-12ffabc manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2023-11-13-f6b0c51 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2023-11-13-f6b0c51 +musllinux_1_1 = quay.io/pypa/musllinux_1_1_i686:2024-01-23-12ffabc +musllinux_1_2 = quay.io/pypa/musllinux_1_2_i686:2024-01-23-12ffabc [pypy_x86_64] manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2024-01-23-12ffabc 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:2023-11-13-f6b0c51 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_x86_64:2024-01-23-12ffabc [pypy_i686] manylinux2010 = quay.io/pypa/manylinux2010_i686:2022-08-05-4535177 -manylinux2014 = quay.io/pypa/manylinux2014_i686:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_i686:2024-01-23-12ffabc manylinux_2_24 = quay.io/pypa/manylinux_2_24_i686:2022-12-26-0d38463 [aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024-01-23-12ffabc manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2023-11-13-f6b0c51 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2023-11-13-f6b0c51 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2023-10-30-2d1b8c5 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024-01-23-12ffabc +musllinux_1_1 = quay.io/pypa/musllinux_1_1_aarch64:2024-01-23-12ffabc +musllinux_1_2 = quay.io/pypa/musllinux_1_2_aarch64:2024-01-23-12ffabc [ppc64le] -manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2024-01-23-12ffabc manylinux_2_24 = quay.io/pypa/manylinux_2_24_ppc64le:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2023-11-13-f6b0c51 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2023-10-30-2d1b8c5 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2023-10-30-2d1b8c5 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_ppc64le:2024-01-23-12ffabc +musllinux_1_1 = quay.io/pypa/musllinux_1_1_ppc64le:2024-01-23-12ffabc +musllinux_1_2 = quay.io/pypa/musllinux_1_2_ppc64le:2024-01-23-12ffabc [s390x] -manylinux2014 = quay.io/pypa/manylinux2014_s390x:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_s390x:2024-01-23-12ffabc manylinux_2_24 = quay.io/pypa/manylinux_2_24_s390x:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2023-11-13-f6b0c51 -musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2023-11-13-f6b0c51 -musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2023-10-30-2d1b8c5 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_s390x:2024-01-23-12ffabc +musllinux_1_1 = quay.io/pypa/musllinux_1_1_s390x:2024-01-23-12ffabc +musllinux_1_2 = quay.io/pypa/musllinux_1_2_s390x:2024-01-23-12ffabc [pypy_aarch64] -manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2023-11-13-f6b0c51 +manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2024-01-23-12ffabc manylinux_2_24 = quay.io/pypa/manylinux_2_24_aarch64:2022-12-26-0d38463 -manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2023-11-13-f6b0c51 +manylinux_2_28 = quay.io/pypa/manylinux_2_28_aarch64:2024-01-23-12ffabc diff --git a/cibuildwheel/util.py b/cibuildwheel/util.py index ae7afbb4..18900fc3 100644 --- a/cibuildwheel/util.py +++ b/cibuildwheel/util.py @@ -738,7 +738,7 @@ def parse_key_value_string( # split by semicolon fields = [list(group) for k, group in itertools.groupby(parts, lambda x: x == ";") if not k] - result: dict[str, list[str]] = defaultdict(list) + result: defaultdict[str, list[str]] = defaultdict(list) for field_i, field in enumerate(fields): # check to see if the option name is specified field_name, sep, first_value = field[0].partition(":") @@ -759,4 +759,4 @@ def parse_key_value_string( result[field_name] += values - return result + return dict(result) diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py index 9fe9f489..30553fc8 100644 --- a/cibuildwheel/windows.py +++ b/cibuildwheel/windows.py @@ -503,7 +503,7 @@ def build(options: Options, tmp_path: Path) -> None: """ While arm64 wheels can be built on other platforms, they cannot be tested. An arm64 runner is required. To silence this warning, - set `CIBW_TEST_SKIP: *-win_arm64`. + set `CIBW_TEST_SKIP: "*-win_arm64"`. """ ) ) diff --git a/docs/changelog.md b/docs/changelog.md index 0b5aba79..e961c813 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -4,6 +4,27 @@ title: Changelog # Changelog +### v2.16.5 + +_30 January 2024_ + +- 🐛 Fix an incompatibility with the GitHub Action and new GitHub Runner images for Windows that bundle Powershell 7.3+ (#1741) +- 🛠 Preliminary support for new `macos-14` arm64 runners (#1743) + +### v2.16.4 + +_28 January 2024_ + +- 🛠 Update manylinux pins to upgrade from a problematic PyPy version. (#1737) + +### v2.16.3 + +_26 January 2024_ + +- 🐛 Fix a bug when building from sdist, where relative paths to files in the package didn't work because the working directory was wrong (#1687) +- 🛠 Adds the ability to disable mounting the host filesystem in containers to `/host`, through the `disable_host_mount` suboption on [`CIBW_CONTAINER_ENGINE`](https://cibuildwheel.readthedocs.io/en/stable/options/#container-engine). +- 📚 A lot of docs improvements! (#1708, #1705, #1686, #1679, #1667, #1665) + ### v2.16.2 _3 October 2023_ diff --git a/docs/data/projects.schema.json b/docs/data/projects.schema.json new file mode 100644 index 00000000..ba12ccb9 --- /dev/null +++ b/docs/data/projects.schema.json @@ -0,0 +1,37 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/docs/data/projects.schema.json", + "type": "array", + "description": "The projects file for cibuildwheel", + "items": { + "type": "object", + "additionalProperties": false, + "properties": { + "name": { "type": "string" }, + "gh": { "type": "string", "pattern": "[^/]*/[^/]*" }, + "stars": { "$ref": "#/items/properties/gh" }, + "pypi": { "type": "string" }, + "notes": { "type": "string" }, + "ci": { + "type": "array", + "items": { + "enum": [ + "github", + "travisci", + "appveyor", + "circleci", + "gitlab", + "cirrusci", + "azurepipelines" + ] + } + }, + "ci_config": { "type": "string" }, + "os": { + "type": "array", + "items": { "enum": ["windows", "apple", "linux"] } + } + }, + "required": ["name", "gh", "ci", "os"] + } +} diff --git a/docs/data/projects.yml b/docs/data/projects.yml index dbfb29d2..6dc23b87 100644 --- a/docs/data/projects.yml +++ b/docs/data/projects.yml @@ -603,13 +603,13 @@ gh: tensorchord/envd ci: [github] os: [apple, linux, windows] - note: A machine learning development environment build tool + notes: A machine learning development environment build tool - name: mosec gh: mosecorg/mosec ci: [github] os: [linux, apple] - note: A machine learning model serving framework powered by Rust + notes: A machine learning model serving framework powered by Rust - name: ril gh: Cryptex-github/ril-py @@ -631,3 +631,17 @@ os: [windows, apple, linux] pypi: aalink notes: Async Python interface for Ableton Link. + +- name: werpy + gh: analyticsinmotion/werpy + ci: [github] + os: [windows, linux, apple] + pypi: werpy + notes: An ultra-fast python package using optimized dynamic programming to compute the Word Error Rate (WER). + +- name: keyvi + gh: KeyviDev/keyvi + ci: [github] + os: [linux, apple] + pypi: keyvi + notes: FST based key value index highly optimized for size and lookup performance, utilizes ccache action for improved runtime diff --git a/docs/deliver-to-pypi.md b/docs/deliver-to-pypi.md index e49d2bb1..292d8960 100644 --- a/docs/deliver-to-pypi.md +++ b/docs/deliver-to-pypi.md @@ -56,8 +56,9 @@ well as several useful actions. Alongside your existing job(s) that runs cibuild - name: Build SDist run: pipx run build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-sdist path: dist/*.tar.gz ``` @@ -74,10 +75,11 @@ This requires setting this GitHub workflow in your project's PyPI settings (for runs-on: ubuntu-latest if: github.event_name == 'release' && github.event.action == 'published' steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: artifact + pattern: cibw-* path: dist + merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 ``` diff --git a/docs/diagram.md b/docs/diagram.html similarity index 100% rename from docs/diagram.md rename to docs/diagram.html diff --git a/docs/extra.css b/docs/extra.css index eac0a193..232ca2c7 100644 --- a/docs/extra.css +++ b/docs/extra.css @@ -315,3 +315,9 @@ h1, h2, h3, h4, h5, h6 { .wy-menu-vertical li.current a { } + +/* word wrap in table cells */ +.wy-table-responsive table td, .wy-table-responsive table th { + white-space: normal; + line-height: 1.4; +} diff --git a/docs/faq.md b/docs/faq.md index 1dfe4108..82fc0859 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -14,7 +14,7 @@ Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.co `cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running container. -- The project directory is copied into the container as `/project`, the output directory for the wheels to be copied out is `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system. Note that `/host` is not available on CircleCI due to their Docker policies. +- The project directory is copied into the container as `/project`, the output directory for the wheels to be copied out is `/output`. In general, this is handled transparently by `cibuildwheel`. For a more finegrained level of control however, the root of the host file system is mounted as `/host`, allowing for example to access shared files, caches, etc. on the host file system. Note that `/host` is not available on CircleCI and GitLab CI due to their Docker policies. - Alternative Docker images can be specified with the `CIBW_MANYLINUX_*_IMAGE`/`CIBW_MUSLLINUX_*_IMAGE` options to allow for a custom, preconfigured build environment for the Linux builds. See [options](options.md#linux-image) for more details. @@ -75,7 +75,7 @@ With the exception of Cirrus CI, macOS CI runners are still Intel-based, and App !!! important When cross-compiling on Intel, it is not possible to test `arm64` and the `arm64` part of a `universal2` wheel. - `cibuildwheel` will raise a warning to notify you of this - these warnings be be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: *_arm64 *_universal2:arm64`. + `cibuildwheel` will raise a warning to notify you of this - these warnings be be silenced by skipping testing on these platforms: `CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"`. !!! note Your runner needs Xcode Command Line Tools 12.2 or later to build `universal2` or `arm64`. @@ -159,7 +159,7 @@ There are two suggested methods for keeping cibuildwheel up to date that instead If you use GitHub Actions for builds, you can use cibuildwheel as an action: ```yaml -uses: pypa/cibuildwheel@v2.16.2 +uses: pypa/cibuildwheel@v2.16.5 ``` This is a composite step that just runs cibuildwheel using pipx. You can set command-line options as `with:` parameters, and use `env:` as normal. @@ -181,7 +181,7 @@ The second option, and the only one that supports other CI systems, is using a ` ```bash # requirements-cibw.txt -cibuildwheel==2.16.2 +cibuildwheel==2.16.5 ``` Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `.github/dependabot.yml` file could look like this: @@ -216,7 +216,6 @@ to build, your pyproject.toml might include a section like this: [build-system] requires = [ "setuptools>=42", - "wheel", "Cython", ] @@ -325,7 +324,7 @@ Solutions to this vary, but the simplest is to use pipx: # most runners have pipx preinstalled, but in case you don't python3 -m pip install pipx -pipx run cibuildwheel==2.16.2 --output-dir wheelhouse +pipx run cibuildwheel==2.16.5 --output-dir wheelhouse pipx run twine upload wheelhouse/*.whl ``` @@ -395,7 +394,7 @@ To investigate the dependencies of a C extension (i.e., the `.pyd` file, a DLL i ### Windows ARM64 builds {: #windows-arm64} -`cibuildwheel` supports cross-compiling `ARM64` wheels on all Windows runners, but a native ARM64 runner is required for testing. On non-native runners, tests for ARM64 wheels will be automatically skipped with a warning. Add `*-win_arm64` to your `CIBW_TEST_SKIP` setting to suppress the warning. +`cibuildwheel` supports cross-compiling `ARM64` wheels on all Windows runners, but a native ARM64 runner is required for testing. On non-native runners, tests for ARM64 wheels will be automatically skipped with a warning. Add `"*-win_arm64"` to your `CIBW_TEST_SKIP` setting to suppress the warning. Cross-compilation on Windows relies on a supported build backend. Supported backends use an environment variable to specify their target platform (the one they are compiling native modules for, as opposed to the one they are running on), which is set in [cibuildwheels/windows.py](https://github.com/pypa/cibuildwheel/blob/main/cibuildwheel/windows.py) before building. Currently, `setuptools>=65.4.1` and `setuptools_rust` are the only supported backends. diff --git a/docs/index.md b/docs/index.md index b28a64bc..49f01bb4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -18,7 +18,7 @@ How it works This diagram summarises the steps that cibuildwheel takes on each platform to build your package's wheels. {% - include-markdown "diagram.md" + include "diagram.html" %} This isn't exhaustive, for a full list of the things cibuildwheel can do, check the [options](options.md) page. diff --git a/docs/options.md b/docs/options.md index 1b11cf3b..b4b937ac 100644 --- a/docs/options.md +++ b/docs/options.md @@ -849,7 +849,6 @@ Platform-specific environment variables are also available:
[build-system] requires = [ "setuptools>=42", - "wheel", "Cython", "numpy==1.13.3; python_version<'3.5'", "oldest-supported-numpy; python_version>='3.5'", @@ -1072,8 +1071,8 @@ Auditwheel detects the version of the manylinux / musllinux standard in the imag Options: -- `docker[;create_args: ...]` -- `podman[;create_args: ...]` +- `docker[;create_args: ...][;disable_host_mount: true/false]` +- `podman[;create_args: ...][;disable_host_mount: true/false]` Default: `docker` @@ -1082,11 +1081,13 @@ Set the container engine to use. Docker is the default, or you can switch to running and `docker` available on PATH. To use Podman, it needs to be installed and `podman` available on PATH. -Arguments can be supplied to the container engine. Currently, the only option -that's customisable is 'create_args'. Parameters to create_args are -space-separated strings, which are passed to the container engine on the -command line when it's creating the container. If you want to include spaces -inside a parameter, use shell-style quoting. +Options can be supplied after the name. + +| Option name | Description +|---|--- +| `create_args` | Space-separated strings, which are passed to the container engine on the command line when it's creating the container. If you want to include spaces inside a parameter, use shell-style quoting. +| `disable_host_mount` | By default, cibuildwheel will mount the root of the host filesystem as a volume at `/host` in the container. To disable the host mount, pass `true` to this option. + !!! tip @@ -1107,6 +1108,9 @@ inside a parameter, use shell-style quoting. # pass command line options to 'docker create' CIBW_CONTAINER_ENGINE: "docker; create_args: --gpus all" + + # disable the /host mount + CIBW_CONTAINER_ENGINE: "docker; disable_host_mount: true" ``` !!! tab examples "pyproject.toml" @@ -1118,6 +1122,9 @@ inside a parameter, use shell-style quoting. # pass command line options to 'docker create' container-engine = { name = "docker", create-args = ["--gpus", "all"]} + + # disable the /host mount + container-engine = { name = "docker", disable-host-mount = true } ``` diff --git a/docs/setup.md b/docs/setup.md index cddf46a2..6f6f13f9 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -61,7 +61,7 @@ You should see the builds taking place. You can experiment with options using en ```sh # run a command to set up the build system - export CIBW_BEFORE_ALL='apt install libpng-dev' + export CIBW_BEFORE_ALL='uname -a' cibuildwheel --platform linux ``` @@ -69,7 +69,7 @@ You should see the builds taking place. You can experiment with options using en > CMD (Windows) ```bat - set CIBW_BEFORE_ALL='apt install libpng-dev' + set CIBW_BEFORE_ALL='uname -a' cibuildwheel --platform linux ``` @@ -82,7 +82,7 @@ You should see the builds taking place. You can experiment with options using en ``` [tool.cibuildwheel] - before-all = "apt install libpng-dev" + before-all = "uname -a" ``` Then invoke cibuildwheel, like: @@ -184,10 +184,11 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/checkout@v4 - name: Build wheels - run: pipx run cibuildwheel==2.16.2 + run: pipx run cibuildwheel==2.16.5 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl ``` @@ -219,13 +220,14 @@ To build Linux, Mac, and Windows wheels using GitHub Actions, create a `.github/ - uses: actions/setup-python@v3 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.16.2 + run: python -m pip install cibuildwheel==2.16.5 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl ``` diff --git a/docs/working-examples.md b/docs/working-examples.md index 9b64135e..8d08d932 100644 --- a/docs/working-examples.md +++ b/docs/working-examples.md @@ -18,12 +18,12 @@ title: Working examples | [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | The compiled version of MyPy using MyPyC. | | [Kivy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Open source UI framework written in Python, running on Windows, Linux, macOS, Android and iOS | | [duckdb][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | DuckDB is an in-process SQL OLAP Database Management System | -| [MemRay][] | ![github icon][] | ![linux icon][] | The endgame Python memory profiler | +| [MemRay][] | ![github icon][] | ![linux icon][] | Memray is a memory profiler for Python | | [uvloop][] | ![github icon][] | ![apple icon][] ![linux icon][] | Ultra fast asyncio event loop. | | [psutil][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python | | [Triton][] | ![github icon][] | ![linux icon][] | Self hosted runners | -| [vaex][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 | | [Google Benchmark][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A microbenchmark support library | +| [vaex][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Out-of-Core hybrid Apache Arrow/NumPy DataFrame for Python, ML, visualization and exploration of big tabular data at a billion rows per second 🚀 | | [Apache Beam][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Apache Beam is a unified programming model for Batch and Streaming data processing. | | [PyGame][] | ![github icon][] | ![apple icon][] ![linux icon][] | 🐍🎮 pygame (the library) is a Free and Open Source python programming language library for making multimedia applications like games built on top of the excellent SDL library. C, Python, Native, OpenGL. | | [asyncpg][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A fast PostgreSQL Database Client Library for Python/asyncio. | @@ -37,29 +37,29 @@ title: Working examples | [UltraJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Ultra fast JSON decoder and encoder written in C with Python bindings | | [OpenSpiel][] | ![github icon][] | ![apple icon][] ![linux icon][] | OpenSpiel is a collection of environments and algorithms for research in general reinforcement learning and search/planning in games. | | [aiortc][] | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. | -| [pyzmq][] | ![github icon][] ![circleci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython on CPython and CFFI on PyPy. ARM wheels for linux are built natively on CircleCI. | | [Confluent client for Kafka][] | ![travisci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | setup in `tools/wheels/build-wheels.bat` | -| [Implicit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes GPU support for linux wheels | +| [pyzmq][] | ![github icon][] ![circleci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython on CPython and CFFI on PyPy. ARM wheels for linux are built natively on CircleCI. | | [Dependency Injector][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI | +| [Implicit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes GPU support for linux wheels | | [vispy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Main repository for Vispy | | [tinyobjloader][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Tiny but powerful single file wavefront obj loader | | [coverage.py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python | | [PyCryptodome][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A self-contained cryptographic library for Python | +| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | | [PyYAML][] | ![github icon][] | ![apple icon][] | Canonical source repository for PyYAML | | [Line Profiler][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Line-by-line profiling for Python | -| [CTranslate2][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit.html) and CUDA kernels compiled for multiple GPU architectures. | | [PyAV][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. | -| [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz and more | +| [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, Pandas, PyTables and more | | [h5py][] | ![azurepipelines icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | HDF5 for Python -- The h5py package is a Pythonic interface to the HDF5 binary data format. | -| [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. | | [pikepdf][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python library for reading and writing PDF, powered by QPDF | +| [Wrapt][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python module for decorators, wrappers and monkey patching. | | [envd][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | 🏕️ Reproducible development environment | | [OpenColorIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | A color management framework for visual effects and animation. | | [SimpleJSON][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | simplejson is a simple, fast, extensible JSON encoder/decoder for Python | | [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [ruptures][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. | -| [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. | | [Psycopg 3][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A modern implementation of a PostgreSQL adapter for Python | +| [OpenTimelineIO][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Open Source API and interchange format for editorial timeline information. | | [PyTables][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data | | [Parselmouth][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python interface to the Praat software package, using pybind11, C++17 and CMake, with the core Praat static library built only once and shared between wheels. | | [DeepForest][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | An Efficient, Scalable and Optimized Python Framework for Deep Forest (2021.2.1) | @@ -67,11 +67,11 @@ title: Working examples | [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [H3-py][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for H3, a hierarchical hexagonal geospatial indexing system | | [mosec][] | ![github icon][] | ![linux icon][] ![apple icon][] | A high-performance ML model serving framework, offers dynamic batching and CPU/GPU pipelines to fully exploit your compute machine | -| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS | | [Picologging][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A high-performance logging library for Python. | +| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS | | [markupsafe][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Safely add untrusted strings to HTML/XML markup. | -| [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | | [time-machine][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Time mocking library using only the CPython C API. | +| [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | | [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python | | [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [python-snappy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Python bindings for the snappy google library | @@ -79,26 +79,26 @@ title: Working examples | [dd-trace-py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub | | [pybind11 python_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system | | [sourmash][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Quickly search, compare, and analyze genomic and metagenomic data sets. | -| [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | -| [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | | [abess][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A fast best-subset selection library. It uses cibuildwheel to build a large project with C++ extensions. | +| [matrixprofile][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python 3 library making time series data mining tasks, utilizing matrix profile algorithms, accessible to everyone. | +| [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | | [Tokenizer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support | | [PyGLM][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Fast OpenGL Mathematics (GLM) for Python | -| [TgCrypto][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [pillow-heif][] | ![github icon][] ![cirrusci icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Bindings to libheif library with third party dependencies. Fully automated CI for tests and publishing including Apple Silicon builds. | -| [iDynTree][] | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 | +| [TgCrypto][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [bx-python][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. | +| [iDynTree][] | ![github icon][] | ![linux icon][] | Uses manylinux_2_24 | | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | | [Python-WebRTC][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | a Python extension that provides bindings to WebRTC M92 | | [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python | -| [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | -| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [power-grid-model][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python/C++ library for distribution power system analysis | +| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | +| [Arbor][] | ![github icon][] | ![apple icon][] ![linux icon][] | Arbor is a multi-compartment neuron simulation library; compatible with next-generation accelerators; best-practices applied to research software; focused on community-driven development. Includes a [small script](https://github.com/arbor-sim/arbor/blob/master/scripts/patchwheel.py) patching `rpath` in bundled libraries. | | [Imagecodecs (fork)][] | ![azurepipelines icon][] | ![apple icon][] ![linux icon][] | Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS. | -| [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | +| [polaroid][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Full range of wheels for setuptools rust, with auto release and PyPI deploy. | | [etebase-py][] | ![travisci icon][] | ![linux icon][] | Python bindings to a Rust library using `setuptools-rust`, and `sccache` for improved speed. | | [clang-format][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Scikit-build wrapper around LLVM's CMake, all platforms, generic wheels. | | [cf-units][] | ![github icon][] | ![apple icon][] ![linux icon][] | Units of measure as required by the Climate and Forecast (CF) Metadata Conventions | @@ -106,12 +106,13 @@ title: Working examples | [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 | | [ril][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A python binding to Rust Imaging library using maturin and Pyo3, utilizes Github Action cache to improve speed. Builds abi3 wheels. | -| [SiPM][] | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. | | [GSD][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Cython and NumPy project with 64-bit wheels. | -| [CorrectionLib][] | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. | +| [SiPM][] | ![github icon][] | ![apple icon][] ![linux icon][] | High performance library for SiPM detectors simulation using C++17, OpenMP and AVX2 intrinsics. | | [xmlstarlet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. | -| [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | +| [CorrectionLib][] | ![github icon][] | ![apple icon][] ![linux icon][] | Structured JSON powered correction library for HEP, designed for the CMS experiment at CERN. | | [aalink][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Async Python interface for Ableton Link. | +| [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | +| [werpy][] | ![github icon][] | ![windows icon][] ![linux icon][] ![apple icon][] | An ultra-fast python package using optimized dynamic programming to compute the Word Error Rate (WER). | | [pybind11 cross build example][] | ![github icon][] ![gitlab icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Same as pybind11 cmake_example but used to demo Linux ARM + Windows + macOS builds on GitLab | [scikit-learn]: https://github.com/scikit-learn/scikit-learn @@ -128,8 +129,8 @@ title: Working examples [uvloop]: https://github.com/MagicStack/uvloop [psutil]: https://github.com/giampaolo/psutil [Triton]: https://github.com/openai/triton -[vaex]: https://github.com/vaexio/vaex [Google Benchmark]: https://github.com/google/benchmark +[vaex]: https://github.com/vaexio/vaex [Apache Beam]: https://github.com/apache/beam [PyGame]: https://github.com/pygame/pygame [asyncpg]: https://github.com/MagicStack/asyncpg @@ -143,29 +144,29 @@ title: Working examples [UltraJSON]: https://github.com/ultrajson/ultrajson [OpenSpiel]: https://github.com/deepmind/open_spiel [aiortc]: https://github.com/aiortc/aiortc -[pyzmq]: https://github.com/zeromq/pyzmq [Confluent client for Kafka]: https://github.com/confluentinc/confluent-kafka-python -[Implicit]: https://github.com/benfred/implicit +[pyzmq]: https://github.com/zeromq/pyzmq [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector +[Implicit]: https://github.com/benfred/implicit [vispy]: https://github.com/vispy/vispy [tinyobjloader]: https://github.com/tinyobjloader/tinyobjloader [coverage.py]: https://github.com/nedbat/coveragepy [PyCryptodome]: https://github.com/Legrandin/pycryptodome +[CTranslate2]: https://github.com/OpenNMT/CTranslate2 [PyYAML]: https://github.com/yaml/pyyaml [Line Profiler]: https://github.com/pyutils/line_profiler -[CTranslate2]: https://github.com/OpenNMT/CTranslate2 [PyAV]: https://github.com/PyAV-Org/PyAV [numexpr]: https://github.com/pydata/numexpr [h5py]: https://github.com/h5py/h5py -[Wrapt]: https://github.com/GrahamDumpleton/wrapt [pikepdf]: https://github.com/pikepdf/pikepdf +[Wrapt]: https://github.com/GrahamDumpleton/wrapt [envd]: https://github.com/tensorchord/envd [OpenColorIO]: https://github.com/AcademySoftwareFoundation/OpenColorIO [SimpleJSON]: https://github.com/simplejson/simplejson [aioquic]: https://github.com/aiortc/aioquic [ruptures]: https://github.com/deepcharles/ruptures -[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO [Psycopg 3]: https://github.com/psycopg/psycopg +[OpenTimelineIO]: https://github.com/PixarAnimationStudios/OpenTimelineIO [PyTables]: https://github.com/PyTables/PyTables [Parselmouth]: https://github.com/YannickJadoul/Parselmouth [DeepForest]: https://github.com/LAMDA-NJU/Deep-Forest @@ -173,11 +174,11 @@ title: Working examples [AutoPy]: https://github.com/autopilot-rs/autopy [H3-py]: https://github.com/uber/h3-py [mosec]: https://github.com/mosecorg/mosec -[Rtree]: https://github.com/Toblerity/rtree [Picologging]: https://github.com/microsoft/picologging +[Rtree]: https://github.com/Toblerity/rtree [markupsafe]: https://github.com/pallets/markupsafe -[pybind11 cmake_example]: https://github.com/pybind/cmake_example [time-machine]: https://github.com/adamchainz/time-machine +[pybind11 cmake_example]: https://github.com/pybind/cmake_example [KDEpy]: https://github.com/tommyod/KDEpy [python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson [python-snappy]: https://github.com/andrix/python-snappy @@ -185,26 +186,26 @@ title: Working examples [dd-trace-py]: https://github.com/DataDog/dd-trace-py [pybind11 python_example]: https://github.com/pybind/python_example [sourmash]: https://github.com/dib-lab/sourmash -[cyvcf2]: https://github.com/brentp/cyvcf2 -[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile [abess]: https://github.com/abess-team/abess +[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile +[cyvcf2]: https://github.com/brentp/cyvcf2 [jq.py]: https://github.com/mwilliamson/jq.py [iminuit]: https://github.com/scikit-hep/iminuit [Tokenizer]: https://github.com/OpenNMT/Tokenizer [PyGLM]: https://github.com/Zuzu-Typ/PyGLM -[TgCrypto]: https://github.com/pyrogram/tgcrypto [pillow-heif]: https://github.com/bigcat88/pillow_heif -[iDynTree]: https://github.com/robotology/idyntree +[TgCrypto]: https://github.com/pyrogram/tgcrypto [bx-python]: https://github.com/bxlab/bx-python +[iDynTree]: https://github.com/robotology/idyntree [boost-histogram]: https://github.com/scikit-hep/boost-histogram [Python-WebRTC]: https://github.com/MarshalX/python-webrtc [pybase64]: https://github.com/mayeut/pybase64 -[Arbor]: https://github.com/arbor-sim/arbor -[fathon]: https://github.com/stfbnc/fathon [power-grid-model]: https://github.com/alliander-opensource/power-grid-model +[fathon]: https://github.com/stfbnc/fathon +[Arbor]: https://github.com/arbor-sim/arbor [Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build -[polaroid]: https://github.com/daggy1234/polaroid [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example +[polaroid]: https://github.com/daggy1234/polaroid [etebase-py]: https://github.com/etesync/etebase-py [clang-format]: https://github.com/ssciwr/clang-format-wheel [cf-units]: https://github.com/SciTools/cf-units @@ -212,12 +213,13 @@ title: Working examples [numpythia]: https://github.com/scikit-hep/numpythia [pyjet]: https://github.com/scikit-hep/pyjet [ril]: https://github.com/Cryptex-github/ril-py -[SiPM]: https://github.com/EdoPro98/SimSiPM [GSD]: https://github.com/glotzerlab/gsd -[CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib +[SiPM]: https://github.com/EdoPro98/SimSiPM [xmlstarlet]: https://github.com/dimitern/xmlstarlet -[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext +[CorrectionLib]: https://github.com/cms-nanoAOD/correctionlib [aalink]: https://github.com/artfwo/aalink +[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext +[werpy]: https://github.com/analyticsinmotion/werpy [pybind11 cross build example]: https://github.com/wbarnha/pybind_cmake_example_crossbuild [appveyor icon]: data/readme_icons/appveyor.svg diff --git a/examples/appveyor-minimal.yml b/examples/appveyor-minimal.yml index f5c3cc6a..e08782e4 100644 --- a/examples/appveyor-minimal.yml +++ b/examples/appveyor-minimal.yml @@ -12,7 +12,7 @@ stack: python 3.7 init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% -install: python -m pip install cibuildwheel==2.16.2 +install: python -m pip install cibuildwheel==2.16.5 build_script: python -m cibuildwheel --output-dir wheelhouse diff --git a/examples/azure-pipelines-minimal.yml b/examples/azure-pipelines-minimal.yml index 0371e1d2..43324b3f 100644 --- a/examples/azure-pipelines-minimal.yml +++ b/examples/azure-pipelines-minimal.yml @@ -6,7 +6,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - pip3 install cibuildwheel==2.16.2 + pip3 install cibuildwheel==2.16.5 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -20,7 +20,7 @@ jobs: - bash: | set -o errexit python3 -m pip install --upgrade pip - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.16.5 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels @@ -34,7 +34,7 @@ jobs: - bash: | set -o errexit python -m pip install --upgrade pip - pip install cibuildwheel==2.16.2 + pip install cibuildwheel==2.16.5 displayName: Install dependencies - bash: cibuildwheel --output-dir wheelhouse . displayName: Build wheels diff --git a/examples/circleci-minimal.yml b/examples/circleci-minimal.yml index 087402bc..e55ae110 100644 --- a/examples/circleci-minimal.yml +++ b/examples/circleci-minimal.yml @@ -11,7 +11,7 @@ jobs: - run: name: Build the Linux wheels. command: | - pip3 install --user cibuildwheel==2.16.2 + pip3 install --user cibuildwheel==2.16.5 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -28,7 +28,7 @@ jobs: - run: name: Build the Linux aarch64 wheels. command: | - python3 -m pip install --user cibuildwheel==2.16.2 + python3 -m pip install --user cibuildwheel==2.16.5 python3 -m cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ @@ -42,7 +42,7 @@ jobs: - run: name: Build the OS X wheels. command: | - pip3 install cibuildwheel==2.16.2 + pip3 install cibuildwheel==2.16.5 cibuildwheel --output-dir wheelhouse - store_artifacts: path: wheelhouse/ diff --git a/examples/cirrus-ci-intel-mac.yml b/examples/cirrus-ci-intel-mac.yml index d61a90d0..c510808e 100644 --- a/examples/cirrus-ci-intel-mac.yml +++ b/examples/cirrus-ci-intel-mac.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==2.16.2 + - python -m pip install cibuildwheel==2.16.5 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/cirrus-ci-minimal.yml b/examples/cirrus-ci-minimal.yml index 039abf18..53ef414b 100644 --- a/examples/cirrus-ci-minimal.yml +++ b/examples/cirrus-ci-minimal.yml @@ -1,6 +1,6 @@ build_and_store_wheels: &BUILD_AND_STORE_WHEELS install_cibuildwheel_script: - - python -m pip install cibuildwheel==2.16.2 + - python -m pip install cibuildwheel==2.16.5 run_cibuildwheel_script: - cibuildwheel wheels_artifacts: diff --git a/examples/github-apple-silicon.yml b/examples/github-apple-silicon.yml index dbae89c2..87a8421f 100644 --- a/examples/github-apple-silicon.yml +++ b/examples/github-apple-silicon.yml @@ -10,10 +10,11 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_ARCHS_MACOS: x86_64 arm64 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-macos path: ./wheelhouse/*.whl diff --git a/examples/github-deploy.yml b/examples/github-deploy.yml index 1210da9b..57e4c871 100644 --- a/examples/github-deploy.yml +++ b/examples/github-deploy.yml @@ -22,10 +22,11 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl build_sdist: @@ -37,8 +38,9 @@ jobs: - name: Build sdist run: pipx run build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-sdist path: dist/*.tar.gz upload_pypi: @@ -51,12 +53,12 @@ jobs: # or, alternatively, upload to PyPI on every tag starting with 'v' (remove on: release above to use this) # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - # unpacks default artifact into dist/ - # if `name: artifact` is omitted, the action will create extra parent dir - name: artifact + # unpacks all CIBW artifacts into dist/ + pattern: cibw-* path: dist + merge-multiple: true - uses: pypa/gh-action-pypi-publish@release/v1 with: diff --git a/examples/github-minimal.yml b/examples/github-minimal.yml index 1d43ad7e..de3e5ee2 100644 --- a/examples/github-minimal.yml +++ b/examples/github-minimal.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 # env: # CIBW_SOME_OPTION: value # ... @@ -23,6 +23,7 @@ jobs: # output-dir: wheelhouse # config-file: "{package}/pyproject.toml" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl diff --git a/examples/github-with-qemu.yml b/examples/github-with-qemu.yml index 494109a3..e218f32e 100644 --- a/examples/github-with-qemu.yml +++ b/examples/github-with-qemu.yml @@ -20,12 +20,13 @@ jobs: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.16.2 + uses: pypa/cibuildwheel@v2.16.5 env: # configure cibuildwheel to build native archs ('auto'), and some # emulated ones CIBW_ARCHS_LINUX: auto aarch64 ppc64le s390x - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: + name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }} path: ./wheelhouse/*.whl diff --git a/examples/gitlab-minimal.yml b/examples/gitlab-minimal.yml index 643c745e..cc06c37f 100644 --- a/examples/gitlab-minimal.yml +++ b/examples/gitlab-minimal.yml @@ -12,7 +12,7 @@ linux: DOCKER_TLS_CERTDIR: "" script: - curl -sSL https://get.docker.com/ | sh - - python -m pip install cibuildwheel==2.16.2 + - python -m pip install cibuildwheel==2.16.5 - cibuildwheel --output-dir wheelhouse artifacts: paths: @@ -23,7 +23,7 @@ windows: before_script: - choco install python -y --version 3.8.6 - choco install git.install -y - - py -m pip install cibuildwheel==2.16.2 + - py -m pip install cibuildwheel==2.16.5 script: - py -m cibuildwheel --output-dir wheelhouse --platform windows artifacts: diff --git a/examples/gitlab-with-qemu.yml b/examples/gitlab-with-qemu.yml index 6d9e7e07..1211631e 100644 --- a/examples/gitlab-with-qemu.yml +++ b/examples/gitlab-with-qemu.yml @@ -14,7 +14,7 @@ linux: - curl -sSL https://get.docker.com/ | sh # Warning: This is extremely slow, be careful with how many wheels you build - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - - python -m pip install cibuildwheel==2.16.2 + - python -m pip install cibuildwheel==2.16.5 # Assuming your CI runner's default architecture is x86_64... - cibuildwheel --output-dir wheelhouse --platform linux --archs aarch64 artifacts: diff --git a/examples/travis-ci-deploy.yml b/examples/travis-ci-deploy.yml index 1d248c0a..ccd0aab3 100644 --- a/examples/travis-ci-deploy.yml +++ b/examples/travis-ci-deploy.yml @@ -20,7 +20,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.16.2 + - python3 -m pip install cibuildwheel==2.16.5 script: # build the wheels, put them into './dist' diff --git a/examples/travis-ci-minimal.yml b/examples/travis-ci-minimal.yml index 7beff1de..ec5add51 100644 --- a/examples/travis-ci-minimal.yml +++ b/examples/travis-ci-minimal.yml @@ -26,7 +26,7 @@ jobs: - ln -s /c/Python38/python.exe /c/Python38/python3.exe install: - - python3 -m pip install cibuildwheel==2.16.2 + - python3 -m pip install cibuildwheel==2.16.5 script: # build the wheels, put them into './wheelhouse' diff --git a/examples/travis-ci-test-and-deploy.yml b/examples/travis-ci-test-and-deploy.yml index fe6b7588..21f44bf1 100644 --- a/examples/travis-ci-test-and-deploy.yml +++ b/examples/travis-ci-test-and-deploy.yml @@ -54,7 +54,7 @@ jobs: - stage: deploy name: Build and deploy Linux wheels services: docker - install: python3 -m pip install cibuildwheel==2.16.2 twine + install: python3 -m pip install cibuildwheel==2.16.5 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl # Deploy on windows @@ -62,7 +62,7 @@ jobs: name: Build and deploy Windows wheels os: windows language: shell - install: python3 -m pip install cibuildwheel==2.16.2 twine + install: python3 -m pip install cibuildwheel==2.16.5 twine script: python3 -m cibuildwheel --output-dir wheelhouse after_success: python3 -m twine upload --skip-existing wheelhouse/*.whl diff --git a/pyproject.toml b/pyproject.toml index 64726c49..ca0f39d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,7 +15,7 @@ log_cli_level = "info" [tool.mypy] -python_version = 3.8 +python_version = "3.8" files = [ "cibuildwheel/*.py", "test/**/*.py", @@ -24,7 +24,6 @@ files = [ "noxfile.py", ] warn_unused_configs = true -show_error_codes = true warn_redundant_casts = true no_implicit_reexport = true @@ -163,3 +162,6 @@ flake8-unused-arguments.ignore-variadic-names = true [tool.ruff.lint.per-file-ignores] "unit_test/*" = ["PLC1901"] "cibuildwheel/_compat/**.py" = ["TID251"] + +[tool.repo-review] +ignore = ["PC170", "PP303"] diff --git a/setup.cfg b/setup.cfg index fd6a91d3..828c5890 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = cibuildwheel -version = 2.16.2 +version = 2.16.5 description = Build Python wheels on CI with minimal configuration. long_description = file: README.md long_description_content_type = text/markdown diff --git a/test/test_from_sdist.py b/test/test_from_sdist.py index f0b7e93e..0021a2ac 100644 --- a/test/test_from_sdist.py +++ b/test/test_from_sdist.py @@ -61,10 +61,23 @@ def test_simple(tmp_path): sdist_dir.mkdir() sdist_path = make_sdist(basic_project, sdist_dir) + setup_py_assertion_snippet = textwrap.dedent( + """ + import os + + assert os.path.exists('setup.py') + assert os.path.exists('{package}/setup.py') + """, + ) + setup_py_assertion_cmd = f'python3 -c "{setup_py_assertion_snippet !s}"' + # build the wheels from sdist actual_wheels = cibuildwheel_from_sdist_run( sdist_path, - add_env={"CIBW_BUILD": "cp39-*"}, + add_env={ + "CIBW_BEFORE_BUILD": setup_py_assertion_cmd, + "CIBW_BUILD": "cp39-*", + }, ) # check that the expected wheels are produced diff --git a/test/test_macos_archs.py b/test/test_macos_archs.py index 4d03dfc5..80945351 100644 --- a/test/test_macos_archs.py +++ b/test/test_macos_archs.py @@ -135,7 +135,7 @@ def test_deployment_target_warning_is_firing(tmp_path, capfd): @pytest.mark.parametrize("skip_arm64_test", [False, True]) -def test_universal2_testing(tmp_path, capfd, skip_arm64_test): +def test_universal2_testing_on_x86_64(tmp_path, capfd, skip_arm64_test): if utils.platform != "macos": pytest.skip("this test is only relevant to macos") if get_xcode_version() < (12, 2): @@ -173,6 +173,35 @@ def test_universal2_testing(tmp_path, capfd, skip_arm64_test): assert set(actual_wheels) == set(expected_wheels) +def test_universal2_testing_on_arm64(tmp_path, capfd): + # cibuildwheel should test the universal2 wheel on both x86_64 and arm64, when run on arm64 + if utils.platform != "macos": + pytest.skip("this test is only relevant to macos") + if platform.machine() != "arm64": + pytest.skip("this test only works on arm64") + + project_dir = tmp_path / "project" + basic_project.generate(project_dir) + + actual_wheels = utils.cibuildwheel_run( + project_dir, + add_env={ + "CIBW_BUILD": "cp39-*", + "CIBW_ARCHS": "universal2", + # check that a native dependency is correctly installed, once per each testing arch + "CIBW_TEST_REQUIRES": "numpy", + "CIBW_TEST_COMMAND": '''python -c "import numpy, platform; print(f'running tests on {platform.machine()} with numpy {numpy.__version__}')"''', + }, + ) + + captured = capfd.readouterr() + assert "running tests on arm64" in captured.out + assert "running tests on x86_64" in captured.out + + expected_wheels = [w for w in ALL_MACOS_WHEELS if "cp39" in w and "universal2" in w] + assert set(actual_wheels) == set(expected_wheels) + + def test_cp38_arm64_testing(tmp_path, capfd): if utils.platform != "macos": pytest.skip("this test is only relevant to macos") diff --git a/unit_test/oci_container_test.py b/unit_test/oci_container_test.py index c342892d..161f8cfa 100644 --- a/unit_test/oci_container_test.py +++ b/unit_test/oci_container_test.py @@ -14,7 +14,7 @@ import tomli_w from cibuildwheel.environment import EnvironmentAssignmentBash from cibuildwheel.oci_container import OCIContainer, OCIContainerEngineConfig -from cibuildwheel.util import detect_ci_provider +from cibuildwheel.util import CIProvider, detect_ci_provider # Test utilities @@ -415,3 +415,29 @@ def test_enforce_32_bit(container_engine, image, shell_args): text=True, ).stdout assert json.loads(container_args) == shell_args + + +@pytest.mark.parametrize( + ("config", "should_have_host_mount"), + [ + ("{name}", True), + ("{name}; disable_host_mount: false", True), + ("{name}; disable_host_mount: true", False), + ], +) +def test_disable_host_mount(tmp_path: Path, container_engine, config, should_have_host_mount): + if detect_ci_provider() in {CIProvider.circle_ci, CIProvider.gitlab}: + pytest.skip("Skipping test because docker on this platform does not support host mounts") + + engine = OCIContainerEngineConfig.from_config_string(config.format(name=container_engine.name)) + + sentinel_file = tmp_path / "sentinel" + sentinel_file.write_text("12345") + + with OCIContainer(engine=engine, image=DEFAULT_IMAGE) as container: + host_mount_path = "/host" + str(sentinel_file) + if should_have_host_mount: + assert container.call(["cat", host_mount_path], capture_output=True) == "12345" + else: + with pytest.raises(subprocess.CalledProcessError): + container.call(["cat", host_mount_path], capture_output=True) diff --git a/unit_test/options_test.py b/unit_test/options_test.py index 3a823d6c..c2163090 100644 --- a/unit_test/options_test.py +++ b/unit_test/options_test.py @@ -201,41 +201,61 @@ def test_toml_environment_quoting(tmp_path: Path, toml_assignment, result_value) @pytest.mark.parametrize( - ("toml_assignment", "result_name", "result_create_args"), + ("toml_assignment", "result_name", "result_create_args", "result_disable_host_mount"), [ ( 'container-engine = "podman"', "podman", [], + False, ), ( 'container-engine = {name = "podman"}', "podman", [], + False, ), ( 'container-engine = "docker; create_args: --some-option"', "docker", ["--some-option"], + False, ), ( 'container-engine = {name = "docker", create-args = ["--some-option"]}', "docker", ["--some-option"], + False, ), ( 'container-engine = {name = "docker", create-args = ["--some-option", "value that contains spaces"]}', "docker", ["--some-option", "value that contains spaces"], + False, ), ( 'container-engine = {name = "docker", create-args = ["--some-option", "value;that;contains;semicolons"]}', "docker", ["--some-option", "value;that;contains;semicolons"], + False, + ), + ( + 'container-engine = {name = "docker", disable-host-mount = true}', + "docker", + [], + True, + ), + ( + 'container-engine = {name = "docker", disable_host_mount = true}', + "docker", + [], + True, ), ], ) -def test_container_engine_option(tmp_path: Path, toml_assignment, result_name, result_create_args): +def test_container_engine_option( + tmp_path: Path, toml_assignment, result_name, result_create_args, result_disable_host_mount +): args = CommandLineArguments.defaults() args.package_dir = tmp_path @@ -253,6 +273,7 @@ def test_container_engine_option(tmp_path: Path, toml_assignment, result_name, r assert parsed_container_engine.name == result_name assert parsed_container_engine.create_args == result_create_args + assert parsed_container_engine.disable_host_mount == result_disable_host_mount def test_environment_pass_references():