Merge remote-tracking branch 'origin/master' into macos-universal2

# Conflicts:
#	bin/sample_build.py
#	cibuildwheel/__main__.py
#	cibuildwheel/macos.py
#	cibuildwheel/util.py
#	cibuildwheel/windows.py
This commit is contained in:
Joe Rickerby
2021-01-23 13:28:06 +00:00
52 changed files with 1117 additions and 375 deletions
+4 -2
View File
@@ -17,9 +17,11 @@ jobs:
python-version: 3.9 python-version: 3.9
architecture: x64 architecture: x64
- name: Install dependencies - name: Install dependencies
run: python -m pip install requests pip-tools run: python -m pip install ".[dev]"
- name: Run update - name: "Run update: dependencies"
run: python ./bin/update_dependencies.py run: python ./bin/update_dependencies.py
- name: "Run update: python configs"
run: python ./bin/update_pythons.py --force
- name: Create Pull Request - name: Create Pull Request
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v3
+9 -1
View File
@@ -16,12 +16,20 @@ repos:
hooks: hooks:
- id: isort - id: isort
- repo: https://github.com/psf/black
rev: 20.8b1
hooks:
- id: black
files: ^bin/update_pythons.py$
args: ["--line-length=120"]
- repo: https://github.com/pre-commit/mirrors-mypy - repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.790 rev: v0.790
hooks: hooks:
- id: mypy - id: mypy
files: ^(cibuildwheel/|test/|bin/projects.py|unit_test/) files: ^(cibuildwheel/|test/|bin/projects.py|bin/update_pythons.py|unit_test/)
pass_filenames: false pass_filenames: false
additional_dependencies: [packaging, click]
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/asottile/pyupgrade
rev: v2.7.4 rev: v2.7.4
+103 -47
View File
@@ -9,7 +9,7 @@ cibuildwheel
Python wheels are great. Building them across **Mac, Linux, Windows**, on **multiple versions of Python**, is not. Python wheels are great. Building them across **Mac, Linux, Windows**, on **multiple versions of Python**, is not.
`cibuildwheel` is here to help. `cibuildwheel` runs on your CI server - currently it supports GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, and CircleCI - and it builds and tests your wheels across all of your platforms. `cibuildwheel` is here to help. `cibuildwheel` runs on your CI server - currently it supports GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI - and it builds and tests your wheels across all of your platforms.
What does it do? What does it do?
@@ -31,21 +31,22 @@ What does it do?
<sup>² Only supported on Travis</sup><br> <sup>² Only supported on Travis</sup><br>
<sup>³ Beta support until Travis CI fixes <a href="https://travis-ci.community/t/no-space-left-on-device-for-system-z/5954/11">a bug</a></sup><br> <sup>³ Beta support until Travis CI fixes <a href="https://travis-ci.community/t/no-space-left-on-device-for-system-z/5954/11">a bug</a></sup><br>
- Builds manylinux, macOS and Windows wheels for CPython and PyPy using Azure Pipelines, Travis CI, AppVeyor, and CircleCI - Builds manylinux, macOS, and Windows wheels for CPython and PyPy
- Works on GitHub Actions, Azure Pipelines, Travis CI, AppVeyor, CircleCI, and GitLab CI
- Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate) - Bundles shared library dependencies on Linux and macOS through [auditwheel](https://github.com/pypa/auditwheel) and [delocate](https://github.com/matthew-brett/delocate)
- Runs the library test suite against the wheel-installed version of your library - Runs the library test suite against the wheel-installed version of your library
Usage Usage
----- -----
`cibuildwheel` currently works on **Travis CI**, **Azure Pipelines**, **AppVeyor**, **GitHub Actions**, **CircleCI**, and **Gitlab CI**. Check the table below for supported platforms on each service: `cibuildwheel` runs inside a CI service. Supported platforms depend on which service you're using:
| | Linux | macOS | Windows | Linux ARM | | | Linux | macOS | Windows | Linux ARM |
|-----------------|-------|-------|---------|--------------| |-----------------|-------|-------|---------|--------------|
| GitHub Actions | ✅ | ✅ | ✅ | ✴️¹ |
| Azure Pipelines | ✅ | ✅ | ✅ | ✴️¹ | | Azure Pipelines | ✅ | ✅ | ✅ | ✴️¹ |
| Travis CI | ✅ | ✅ | ✅ | ✅ | | Travis CI | ✅ | ✅ | ✅ | ✅ |
| AppVeyor | ✅ | ✅ | ✅ | | | AppVeyor | ✅ | ✅ | ✅ | |
| GitHub Actions | ✅ | ✅ | ✅ | ✴️¹ |
| CircleCI | ✅ | ✅ | | | | CircleCI | ✅ | ✅ | | |
| Gitlab CI | ✅ | | | | | Gitlab CI | ✅ | | | |
@@ -80,7 +81,7 @@ jobs:
name: Install Python name: Install Python
- name: Install cibuildwheel - name: Install cibuildwheel
run: python -m pip install cibuildwheel==1.7.4 run: python -m pip install cibuildwheel==1.8.0
- name: Build wheels - name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse run: python -m cibuildwheel --output-dir wheelhouse
@@ -92,7 +93,7 @@ jobs:
path: ./wheelhouse/*.whl path: ./wheelhouse/*.whl
``` ```
For more information, including building on Python 2, PyPI deployment, and the use of other CI services like Travis CI, Appveyor, Azure Pipelines, or CircleCI, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/joerick/cibuildwheel/tree/master/examples). For more information, including building on Python 2, PyPI deployment, and the use of other CI services, check out the [documentation](https://cibuildwheel.readthedocs.org) and the [examples](https://github.com/joerick/cibuildwheel/tree/master/examples).
Options Options
------- -------
@@ -101,6 +102,7 @@ Options
|---|--------|-------------| |---|--------|-------------|
| **Build selection** | [`CIBW_PLATFORM`](https://cibuildwheel.readthedocs.io/en/stable/options/#platform) | Override the auto-detected target platform | | **Build selection** | [`CIBW_PLATFORM`](https://cibuildwheel.readthedocs.io/en/stable/options/#platform) | Override the auto-detected target platform |
| | [`CIBW_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip) <br> [`CIBW_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip) | Choose the Python versions to build | | | [`CIBW_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip) <br> [`CIBW_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-skip) | Choose the Python versions to build |
| | [`CIBW_ARCHS_LINUX`](https://cibuildwheel.readthedocs.io/en/stable/options/#archs) | Build non-native architectures |
| **Build customization** | [`CIBW_ENVIRONMENT`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment) | Set environment variables needed during the build | | **Build customization** | [`CIBW_ENVIRONMENT`](https://cibuildwheel.readthedocs.io/en/stable/options/#environment) | Set environment variables needed during the build |
| | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all) | Execute a shell command on the build system before any wheels are built. | | | [`CIBW_BEFORE_ALL`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-all) | Execute a shell command on the build system before any wheels are built. |
| | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build) | Execute a shell command preparing each wheel's build | | | [`CIBW_BEFORE_BUILD`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-build) | Execute a shell command preparing each wheel's build |
@@ -111,6 +113,7 @@ Options
| | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test) | Execute a shell command before testing each wheel | | | [`CIBW_BEFORE_TEST`](https://cibuildwheel.readthedocs.io/en/stable/options/#before-test) | Execute a shell command before testing each wheel |
| | [`CIBW_TEST_REQUIRES`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-requires) | Install Python dependencies before running the tests | | | [`CIBW_TEST_REQUIRES`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-requires) | Install Python dependencies before running the tests |
| | [`CIBW_TEST_EXTRAS`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-extras) | Install your wheel for testing using extras_require | | | [`CIBW_TEST_EXTRAS`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-extras) | Install your wheel for testing using extras_require |
| | [`CIBW_TEST_SKIP`](https://cibuildwheel.readthedocs.io/en/stable/options/#test-skip) | Skip running tests on some builds |
| **Other** | [`CIBW_BUILD_VERBOSITY`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-verbosity) | Increase/decrease the output of pip wheel | | **Other** | [`CIBW_BUILD_VERBOSITY`](https://cibuildwheel.readthedocs.io/en/stable/options/#build-verbosity) | Increase/decrease the output of pip wheel |
@@ -129,17 +132,21 @@ Here are some repos that use cibuildwheel.
|-----------------------------------|----|----|:------| |-----------------------------------|----|----|:------|
| [scikit-learn][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The machine learning library. A complex but clean config using many of cibuildwheel's features to build a large project with Cython and C++ extensions. | | [scikit-learn][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The machine learning library. A complex but clean config using many of cibuildwheel's features to build a large project with Cython and C++ extensions. |
| [Matplotlib][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions | | [Matplotlib][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The venerable Matplotlib, a Python library with C++ portions |
| [MyPy][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | MyPyC, the compiled component of MyPy. |
| [psutil][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python | | [psutil][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Cross-platform lib for process and system monitoring in Python |
| [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
| [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. | | [scikit-image][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Image processing library. Uses cibuildwheel to build and test a project that uses Cython with platform-native code. |
| [twisted-iocpsupport][] | ![github icon][] | ![windows icon][] | A submodule of Twisted that hooks into native C APIs using Cython. |
| [websockets][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module. | | [websockets][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Library for building WebSocket servers and clients. Mostly written in Python, with a small C 'speedups' extension module. |
| [pyzmq][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI. | | [pyzmq][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python bindings for zeromq, the networking library. Uses Cython and CFFI. |
| [aiortc][] | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. | | [aiortc][] | ![github icon][] | ![apple icon][] ![linux icon][] | WebRTC and ORTC implementation for Python using asyncio. |
| [numexpr][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas, bcolz 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. | | [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. |
| [coverage.py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python | | [coverage.py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | The coverage tool for Python |
| [River][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python | | [River][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | 🌊 Online machine learning in Python |
| [PyAV][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. | | [PyAV][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Pythonic bindings for FFmpeg's libraries. |
| [Dependency Injector][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI | | [Dependency Injector][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Dependency injection framework for Python, uses Windows TravisCI |
| [PyTables][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A Python package to manage extremely large amounts of data |
| [ruptures][] | ![github icon][] | ![apple icon][] ![linux icon][] ![windows icon][] | Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example. |
| [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python | | [aioquic][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | QUIC and HTTP/3 implementation in Python |
| [google neuroglancer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data | | [google neuroglancer][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | WebGL-based viewer for volumetric data |
| [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. | | [AutoPy][] | ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Includes a Windows Travis build. |
@@ -148,10 +155,15 @@ Here are some repos that use cibuildwheel.
| [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson | | [python-rapidjson][] | ![travisci icon][] ![gitlab icon][] ![appveyor icon][] | ![windows icon][] ![linux icon][] | Python wrapper around rapidjson |
| [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ | | [Rtree][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Rtree: spatial index for Python GIS ¶ |
| [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python | | [KDEpy][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Kernel Density Estimation in Python |
| [pybind11 python_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system | | [cyvcf2][] | ![github icon][] | ![apple icon][] ![linux icon][] | cython + htslib == fast VCF and BCF processing |
| [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system | | [pybind11 cmake_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a CMake-based build system |
| [pybind11 python_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Example pybind11 module built with a Python-based build system |
| [dd-trace-py][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Uses custom alternate arch emulation on GitHub |
| [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 | | [iminuit][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Jupyter-friendly Python interface for C++ MINUIT2 |
| [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq | | [jq.py][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | Python bindings for jq |
| [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. |
| [CTranslate2][] | ![github icon][] | ![apple icon][] ![linux icon][] | Includes libraries from the [Intel oneAPI toolkit](https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html). The Linux wheels also include CUDA libraries for GPU execution. |
| [Tokenizer][] | ![github icon][] ![travisci icon][] | ![apple icon][] ![linux icon][] | Fast and customizable text tokenization library with BPE and SentencePiece support |
| [bx-python][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. | | [bx-python][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | A library that includes Cython extensions. |
| [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. | | [boost-histogram][] | ![github icon][] ![travisci icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Supports full range of wheels, including PyPy and alternate archs. |
| [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python | | [pybase64][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Fast Base64 encoding/decoding in Python |
@@ -161,22 +173,27 @@ Here are some repos that use cibuildwheel.
| [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy | | [numpythia][] | ![github icon][] | ![apple icon][] ![linux icon][] | The interface between PYTHIA and NumPy |
| [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms | | [fathon][] | ![travisci icon][] | ![apple icon][] ![linux icon][] | python package for DFA (Detrended Fluctuation Analysis) and related algorithms |
| [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies | | [pyinstrument_cext][] | ![travisci icon][] ![appveyor icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | A simple C extension, without external dependencies |
| [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. |
| [xmlstarlet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. | | [xmlstarlet][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | Python 3.6+ CFFI bindings with true MSVC build. |
| [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 | | [pybind11 scikit_build_example][] | ![github icon][] | ![windows icon][] ![apple icon][] ![linux icon][] | An example combining scikit-build and pybind11 |
[scikit-learn]: https://github.com/scikit-learn/scikit-learn [scikit-learn]: https://github.com/scikit-learn/scikit-learn
[Matplotlib]: https://github.com/matplotlib/matplotlib [Matplotlib]: https://github.com/matplotlib/matplotlib
[MyPy]: https://github.com/mypyc/mypy_mypyc-wheels
[psutil]: https://github.com/giampaolo/psutil [psutil]: https://github.com/giampaolo/psutil
[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
[scikit-image]: https://github.com/scikit-image/scikit-image [scikit-image]: https://github.com/scikit-image/scikit-image
[twisted-iocpsupport]: https://github.com/twisted/twisted-iocpsupport
[websockets]: https://github.com/aaugustin/websockets [websockets]: https://github.com/aaugustin/websockets
[pyzmq]: https://github.com/zeromq/pyzmq [pyzmq]: https://github.com/zeromq/pyzmq
[aiortc]: https://github.com/aiortc/aiortc [aiortc]: https://github.com/aiortc/aiortc
[numexpr]: https://github.com/pydata/numexpr
[h5py]: https://github.com/h5py/h5py [h5py]: https://github.com/h5py/h5py
[coverage.py]: https://github.com/nedbat/coveragepy [coverage.py]: https://github.com/nedbat/coveragepy
[River]: https://github.com/online-ml/river [River]: https://github.com/online-ml/river
[PyAV]: https://github.com/PyAV-Org/PyAV [PyAV]: https://github.com/PyAV-Org/PyAV
[Dependency Injector]: https://github.com/ets-labs/python-dependency-injector [Dependency Injector]: https://github.com/ets-labs/python-dependency-injector
[PyTables]: https://github.com/PyTables/PyTables
[ruptures]: https://github.com/deepcharles/ruptures
[aioquic]: https://github.com/aiortc/aioquic [aioquic]: https://github.com/aiortc/aioquic
[google neuroglancer]: https://github.com/google/neuroglancer [google neuroglancer]: https://github.com/google/neuroglancer
[AutoPy]: https://github.com/autopilot-rs/autopy [AutoPy]: https://github.com/autopilot-rs/autopy
@@ -185,10 +202,15 @@ Here are some repos that use cibuildwheel.
[python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson [python-rapidjson]: https://github.com/python-rapidjson/python-rapidjson
[Rtree]: https://github.com/Toblerity/rtree [Rtree]: https://github.com/Toblerity/rtree
[KDEpy]: https://github.com/tommyod/KDEpy [KDEpy]: https://github.com/tommyod/KDEpy
[pybind11 python_example]: https://github.com/pybind/python_example [cyvcf2]: https://github.com/brentp/cyvcf2
[pybind11 cmake_example]: https://github.com/pybind/cmake_example [pybind11 cmake_example]: https://github.com/pybind/cmake_example
[pybind11 python_example]: https://github.com/pybind/python_example
[dd-trace-py]: https://github.com/DataDog/dd-trace-py
[iminuit]: https://github.com/scikit-hep/iminuit [iminuit]: https://github.com/scikit-hep/iminuit
[jq.py]: https://github.com/mwilliamson/jq.py [jq.py]: https://github.com/mwilliamson/jq.py
[matrixprofile]: https://github.com/matrix-profile-foundation/matrixprofile
[CTranslate2]: https://github.com/OpenNMT/CTranslate2
[Tokenizer]: https://github.com/OpenNMT/Tokenizer
[bx-python]: https://github.com/bxlab/bx-python [bx-python]: https://github.com/bxlab/bx-python
[boost-histogram]: https://github.com/scikit-hep/boost-histogram [boost-histogram]: https://github.com/scikit-hep/boost-histogram
[pybase64]: https://github.com/mayeut/pybase64 [pybase64]: https://github.com/mayeut/pybase64
@@ -198,6 +220,7 @@ Here are some repos that use cibuildwheel.
[numpythia]: https://github.com/scikit-hep/numpythia [numpythia]: https://github.com/scikit-hep/numpythia
[fathon]: https://github.com/stfbnc/fathon [fathon]: https://github.com/stfbnc/fathon
[pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext [pyinstrument_cext]: https://github.com/joerick/pyinstrument_cext
[Imagecodecs (fork)]: https://github.com/czaki/imagecodecs_build
[xmlstarlet]: https://github.com/dimitern/xmlstarlet [xmlstarlet]: https://github.com/dimitern/xmlstarlet
[pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example [pybind11 scikit_build_example]: https://github.com/pybind/scikit_build_example
@@ -211,46 +234,56 @@ Here are some repos that use cibuildwheel.
[apple icon]: docs/data/readme_icons/apple.svg [apple icon]: docs/data/readme_icons/apple.svg
[linux icon]: docs/data/readme_icons/linux.svg [linux icon]: docs/data/readme_icons/linux.svg
<!-- scikit-learn: 43477, last pushed 0 days ago --> <!-- scikit-learn: 43800, last pushed 0 days ago -->
<!-- Matplotlib: 12823, last pushed 0 days ago --> <!-- Matplotlib: 12963, last pushed 0 days ago -->
<!-- psutil: 6887, last pushed 0 days ago --> <!-- MyPy: 9770, last pushed 0 days ago -->
<!-- twisted-iocpsupport: 4114, last pushed 2 days ago --> <!-- psutil: 6990, last pushed 5 days ago -->
<!-- scikit-image: 4104, last pushed 0 days ago --> <!-- scikit-image: 4143, last pushed 0 days ago -->
<!-- websockets: 3089, last pushed 10 days ago --> <!-- twisted-iocpsupport: 4140, last pushed 7 days ago -->
<!-- pyzmq: 2654, last pushed 20 days ago --> <!-- websockets: 3146, last pushed 9 days ago -->
<!-- aiortc: 2073, last pushed 7 days ago --> <!-- pyzmq: 2675, last pushed 1 days ago -->
<!-- h5py: 1455, last pushed 12 days ago --> <!-- aiortc: 2113, last pushed 7 days ago -->
<!-- coverage.py: 1441, last pushed 3 days ago --> <!-- numexpr: 1512, last pushed 16 days ago -->
<!-- River: 1219, last pushed 0 days ago --> <!-- h5py: 1474, last pushed 2 days ago -->
<!-- PyAV: 1114, last pushed 14 days ago --> <!-- coverage.py: 1471, last pushed 2 days ago -->
<!-- Dependency Injector: 1030, last pushed 0 days ago --> <!-- River: 1296, last pushed 0 days ago -->
<!-- aioquic: 552, last pushed 49 days ago --> <!-- PyAV: 1142, last pushed 13 days ago -->
<!-- google neuroglancer: 550, last pushed 7 days ago --> <!-- Dependency Injector: 1070, last pushed 0 days ago -->
<!-- AutoPy: 507, last pushed 105 days ago --> <!-- PyTables: 1001, last pushed 6 days ago -->
<!-- pikepdf: 487, last pushed 0 days ago --> <!-- ruptures: 589, last pushed 3 days ago -->
<!-- Parselmouth: 433, last pushed 26 days ago --> <!-- aioquic: 571, last pushed 78 days ago -->
<!-- python-rapidjson: 407, last pushed 10 days ago --> <!-- google neuroglancer: 555, last pushed 0 days ago -->
<!-- Rtree: 378, last pushed 0 days ago --> <!-- AutoPy: 517, last pushed 134 days ago -->
<!-- KDEpy: 230, last pushed 9 days ago --> <!-- pikepdf: 517, last pushed 5 days ago -->
<!-- pybind11 python_example: 221, last pushed 44 days ago --> <!-- Parselmouth: 450, last pushed 1 days ago -->
<!-- pybind11 cmake_example: 219, last pushed 7 days ago --> <!-- python-rapidjson: 410, last pushed 39 days ago -->
<!-- iminuit: 166, last pushed 0 days ago --> <!-- Rtree: 387, last pushed 28 days ago -->
<!-- jq.py: 138, last pushed 73 days ago --> <!-- KDEpy: 235, last pushed 37 days ago -->
<!-- bx-python: 94, last pushed 1 days ago --> <!-- cyvcf2: 233, last pushed 0 days ago -->
<!-- boost-histogram: 63, last pushed 0 days ago --> <!-- pybind11 cmake_example: 226, last pushed 35 days ago -->
<!-- pybase64: 52, last pushed 2 days ago --> <!-- pybind11 python_example: 224, last pushed 73 days ago -->
<!-- TgCrypto: 49, last pushed 36 days ago --> <!-- dd-trace-py: 206, last pushed 0 days ago -->
<!-- etebase-py: 40, last pushed 3 days ago --> <!-- iminuit: 166, last pushed 25 days ago -->
<!-- pyjet: 27, last pushed 29 days ago --> <!-- jq.py: 140, last pushed 102 days ago -->
<!-- numpythia: 23, last pushed 28 days ago --> <!-- matrixprofile: 124, last pushed 2 days ago -->
<!-- fathon: 18, last pushed 1 days ago --> <!-- CTranslate2: 123, last pushed 0 days ago -->
<!-- pyinstrument_cext: 10, last pushed 29 days ago --> <!-- Tokenizer: 115, last pushed 3 days ago -->
<!-- xmlstarlet: 7, last pushed 0 days ago --> <!-- bx-python: 95, last pushed 30 days ago -->
<!-- pybind11 scikit_build_example: 0, last pushed 42 days ago --> <!-- boost-histogram: 66, last pushed 0 days ago -->
<!-- pybase64: 54, last pushed 0 days ago -->
<!-- TgCrypto: 51, last pushed 65 days ago -->
<!-- etebase-py: 40, last pushed 17 days ago -->
<!-- pyjet: 27, last pushed 3 days ago -->
<!-- numpythia: 24, last pushed 9 days ago -->
<!-- fathon: 20, last pushed 4 days ago -->
<!-- pyinstrument_cext: 10, last pushed 57 days ago -->
<!-- Imagecodecs (fork): 10, last pushed 7 days ago -->
<!-- xmlstarlet: 7, last pushed 2 days ago -->
<!-- pybind11 scikit_build_example: 2, last pushed 18 days ago -->
<!-- END bin/projects.py --> <!-- END bin/projects.py -->
> Add your repo here! Send a PR, adding your information to `docs/data/projects.yml`. > Add your repo here! Let us know on [GitHub Discussions](https://github.com/joerick/cibuildwheel/discussions/485), or send a PR, adding your information to `docs/data/projects.yml`.
> >
> <sup>I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions!</sup> > <sup>I'd like to include notes here to indicate why an example might be interesting to cibuildwheel users - the styles/technologies/techniques used in each. Please include that in future additions!</sup>
@@ -270,6 +303,27 @@ Changelog
<!--changelog-start--> <!--changelog-start-->
### 1.8.0
_22 January 2021_
- 🌟 Added support for emulated builds! You can now build manylinux wheels on
ARM64`aarch64`, as well as `ppc64le` and 's390x'. To build under emulation,
register QEMU via binfmt_misc and set the
[`CIBW_ARCHS_LINUX`](https://cibuildwheel.readthedocs.io/en/latest/options/#archs)
option to the architectures you want to run. See
[this FAQ entry](https://cibuildwheel.readthedocs.io/en/latest/faq/#emulation)
for more information. (#482)
- ✨ Added `CIBW_TEST_SKIP` option. This allows you to choose certain builds
whose tests you'd like to skip. This might be useful when running a slow
test suite under emulation, for example. (#537)
- ✨ Added `curly-{brace,bracket,paren}` style globbing to `CIBW_BUILD` and
`CIBW_SKIP`. This gives more expressivity, letting you do things like
`CIBW_BUILD=cp39-manylinux_{aarch64,ppc64le}`. (#527)
- 🛠 cibuildwheel will now exit with an error if it's called with options that
skip all builds on a platform. This feature can be disabled by adding
`--allow-empty` on the command line. (#545)
### 1.7.4 ### 1.7.4
_2 January 2021_ _2 January 2021_
@@ -734,6 +788,8 @@ Massive props also to-
- @zfrenchee for [help debugging many issues](https://github.com/joerick/cibuildwheel/issues/2) - @zfrenchee for [help debugging many issues](https://github.com/joerick/cibuildwheel/issues/2)
- @lelit for some great bug reports and [contributions](https://github.com/joerick/cibuildwheel/pull/73) - @lelit for some great bug reports and [contributions](https://github.com/joerick/cibuildwheel/pull/73)
- @mayeut for a [phenomenal PR](https://github.com/joerick/cibuildwheel/pull/71) patching Python itself for better compatibility! - @mayeut for a [phenomenal PR](https://github.com/joerick/cibuildwheel/pull/71) patching Python itself for better compatibility!
- @czaki for being a super-contributor over many PRs and helping out with countless issues!
- @mattip for his help with adding PyPy support to cibuildwheel
See also See also
======== ========
+6 -4
View File
@@ -19,8 +19,10 @@ runs:
# This needs powershell-core because github.action path is a Windows-style # This needs powershell-core because github.action path is a Windows-style
# path on Windows. Powershell-core understands both types of paths. # path on Windows. Powershell-core understands both types of paths.
- run: python -m pip install ${{ github.action_path }} - run: >
pipx run
--spec ${{ github.action_path }}
cibuildwheel
${{ inputs.package-dir }}
--output-dir ${{ inputs.output-dir }}
shell: pwsh shell: pwsh
- run: python -m cibuildwheel ${{ inputs.package-dir }} --output-dir ${{ inputs.output-dir }}
shell: bash
+10 -6
View File
@@ -1,8 +1,10 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import glob import glob
import os import os
import subprocess import subprocess
import sys
import urllib.parse import urllib.parse
from pathlib import Path from pathlib import Path
@@ -23,6 +25,8 @@ config = [
] ]
# This file requires Python 3.7
# Setting -> None will cause MyPy to notice this.
@click.command() @click.command()
def bump_version(): def bump_version():
current_version = cibuildwheel.__version__ current_version = cibuildwheel.__version__
@@ -49,7 +53,7 @@ def bump_version():
if repo_has_uncommitted_changes: if repo_has_uncommitted_changes:
print('error: Uncommitted changes detected.') print('error: Uncommitted changes detected.')
exit(1) sys.exit(1)
print( 'Current version:', current_version) # noqa print( 'Current version:', current_version) # noqa
new_version = input(' New version: ').strip() new_version = input(' New version: ').strip()
@@ -59,7 +63,7 @@ def bump_version():
except InvalidVersion: except InvalidVersion:
print("error: This version doesn't conform to PEP440") print("error: This version doesn't conform to PEP440")
print(' https://www.python.org/dev/peps/pep-0440/') print(' https://www.python.org/dev/peps/pep-0440/')
exit(1) sys.exit(1)
actions = [] actions = []
@@ -68,7 +72,7 @@ def bump_version():
if not paths: if not paths:
print(f'error: Pattern {path_pattern} didnt match any files') print(f'error: Pattern {path_pattern} didnt match any files')
exit(1) sys.exit(1)
find_pattern = version_pattern.format(current_version) find_pattern = version_pattern.format(current_version)
replace_pattern = version_pattern.format(new_version) replace_pattern = version_pattern.format(new_version)
@@ -83,8 +87,8 @@ def bump_version():
) )
if not found_at_least_one_file_needing_update: if not found_at_least_one_file_needing_update:
print(f'error: Didnt find any occurences of “{find_pattern}” in “{path_pattern}') print(f'error: Didnt find any occurrences of “{find_pattern}” in “{path_pattern}')
exit(1) sys.exit(1)
print() print()
print("Here's the plan:") print("Here's the plan:")
@@ -102,7 +106,7 @@ def bump_version():
if answer != 'y': if answer != 'y':
print('Aborted') print('Aborted')
exit(1) sys.exit(1)
for path, find, replace in actions: for path, find, replace in actions:
contents = path.read_text(encoding='utf8') contents = path.read_text(encoding='utf8')
+2 -1
View File
@@ -1,6 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import os import os
import sys
import textwrap import textwrap
import time import time
from pathlib import Path from pathlib import Path
@@ -26,7 +27,7 @@ def main():
if git_repo_has_changes(): if git_repo_has_changes():
print('Your git repo has uncommitted changes. Commit or stash before continuing.') print('Your git repo has uncommitted changes. Commit or stash before continuing.')
exit(1) sys.exit(1)
previous_branch = shell('git rev-parse --abbrev-ref HEAD', previous_branch = shell('git rev-parse --abbrev-ref HEAD',
check=True, check=True,
+7 -2
View File
@@ -20,7 +20,7 @@ from typing import Any, Dict, List, Optional, TextIO
import click import click
import yaml import yaml
from github import Github from github import Github, GithubException
ICONS = ( ICONS = (
"appveyor", "appveyor",
@@ -53,7 +53,12 @@ class Project:
self.online = github is not None self.online = github is not None
if github is not None: if github is not None:
try:
repo = github.get_repo(self.stars_repo) repo = github.get_repo(self.stars_repo)
except GithubException:
print(f"Broken: {self.stars_repo}")
raise
self.num_stars = repo.stargazers_count self.num_stars = repo.stargazers_count
self.pushed_at = repo.pushed_at self.pushed_at = repo.pushed_at
if not self.notes: if not self.notes:
@@ -167,7 +172,7 @@ def str_projects(
return io.getvalue() return io.getvalue()
@click.command() @click.command(help="Try ./bin/projects.py docs/data/projects.yml --readme README.md")
@click.argument("input", type=click.File("r")) @click.argument("input", type=click.File("r"))
@click.option("--online/--no-online", default=True, help="Get info from GitHub") @click.option("--online/--no-online", default=True, help="Get info from GitHub")
@click.option("--auth", help="GitHub authentication token") @click.option("--auth", help="GitHub authentication token")
+1 -1
View File
@@ -98,7 +98,7 @@ def run_example_ci_configs(config_files=None):
if git_repo_has_changes(): if git_repo_has_changes():
print('Your git repo has uncommitted changes. Commit or stash before continuing.') print('Your git repo has uncommitted changes. Commit or stash before continuing.')
exit(1) sys.exit(1)
previous_branch = shell('git rev-parse --abbrev-ref HEAD', previous_branch = shell('git rev-parse --abbrev-ref HEAD',
check=True, check=True,
+1 -1
View File
@@ -22,4 +22,4 @@ if __name__ == '__main__':
options.project_python_path, project_dir options.project_python_path, project_dir
], check=True) ], check=True)
exit(subprocess.run([sys.executable, '-m', 'cibuildwheel'], cwd=project_dir).returncode) sys.exit(subprocess.run([sys.executable, '-m', 'cibuildwheel'], cwd=project_dir).returncode)
+3 -3
View File
@@ -28,8 +28,8 @@ if '--no-docker' in sys.argv:
'--output-file', f'cibuildwheel/resources/constraints-python{python_version}.txt' '--output-file', f'cibuildwheel/resources/constraints-python{python_version}.txt'
]) ])
else: else:
image = 'quay.io/pypa/manylinux2010_x86_64:latest' image_runner = 'quay.io/pypa/manylinux2010_x86_64:latest'
subprocess.check_call(['docker', 'pull', image]) subprocess.check_call(['docker', 'pull', image_runner])
for python_version in PYTHON_VERSIONS: for python_version in PYTHON_VERSIONS:
abi_flags = '' if int(python_version) >= 38 else 'm' abi_flags = '' if int(python_version) >= 38 else 'm'
python_path = f'/opt/python/cp{python_version}-cp{python_version}{abi_flags}/bin/' python_path = f'/opt/python/cp{python_version}-cp{python_version}{abi_flags}/bin/'
@@ -37,7 +37,7 @@ else:
'docker', 'run', '--rm', 'docker', 'run', '--rm',
'-e', 'CUSTOM_COMPILE_COMMAND', '-e', 'CUSTOM_COMPILE_COMMAND',
'-v', f'{os.getcwd()}:/volume', '-v', f'{os.getcwd()}:/volume',
'--workdir', '/volume', image, '--workdir', '/volume', image_runner,
'bash', '-c', 'bash', '-c',
f'{python_path}pip install pip-tools &&' f'{python_path}pip install pip-tools &&'
f'{python_path}pip-compile --allow-unsafe --upgrade ' f'{python_path}pip-compile --allow-unsafe --upgrade '
+310
View File
@@ -0,0 +1,310 @@
#!/usr/bin/env python3
import copy
import difflib
import logging
from pathlib import Path
from typing import Dict, Optional, Union
import click
import requests
import rich
import toml
from packaging.specifiers import Specifier
from packaging.version import Version
from rich.logging import RichHandler
from rich.syntax import Syntax
from cibuildwheel.extra import InlineArrayDictEncoder
from cibuildwheel.typing import Final, Literal, TypedDict
log = logging.getLogger("cibw")
# Looking up the dir instead of using utils.resources_dir
# since we want to write to it.
DIR: Final[Path] = Path(__file__).parent.parent.resolve()
RESOURCES_DIR: Final[Path] = DIR / "cibuildwheel/resources"
ArchStr = Literal["32", "64"]
class ConfigWinCP(TypedDict):
identifier: str
version: str
arch: str
class ConfigWinPP(TypedDict):
identifier: str
version: str
arch: str
url: str
class ConfigMacOS(TypedDict):
identifier: str
version: str
url: str
AnyConfig = Union[ConfigWinCP, ConfigWinPP, ConfigMacOS]
# The following set of "Versions" classes allow the initial call to the APIs to
# be cached and reused in the `update_version_*` methods.
class WindowsVersions:
def __init__(self, arch_str: ArchStr) -> None:
response = requests.get("https://api.nuget.org/v3/index.json")
response.raise_for_status()
api_info = response.json()
for resource in api_info["resources"]:
if resource["@type"] == "PackageBaseAddress/3.0.0":
endpoint = resource["@id"]
ARCH_DICT = {"32": "win32", "64": "win_amd64"}
PACKAGE_DICT = {"32": "pythonx86", "64": "python"}
self.arch_str = arch_str
self.arch = ARCH_DICT[arch_str]
package = PACKAGE_DICT[arch_str]
response = requests.get(f"{endpoint}{package}/index.json")
response.raise_for_status()
cp_info = response.json()
versions = (Version(v) for v in cp_info["versions"])
self.versions = sorted(v for v in versions if not v.is_devrelease)
def update_version_windows(self, spec: Specifier) -> Optional[ConfigWinCP]:
versions = sorted(v for v in self.versions if spec.contains(v))
if not all(v.is_prerelease for v in versions):
versions = [v for v in versions if not v.is_prerelease]
log.debug(f"Windows {self.arch} {spec} has {', '.join(str(v) for v in versions)}")
if not versions:
return None
version = versions[-1]
identifier = f"cp{version.major}{version.minor}-{self.arch}"
result = ConfigWinCP(
identifier=identifier,
version=str(version),
arch=self.arch_str,
)
return result
class PyPyVersions:
def __init__(self, arch_str: ArchStr):
response = requests.get("https://downloads.python.org/pypy/versions.json")
response.raise_for_status()
releases = [r for r in response.json() if r["pypy_version"] != "nightly"]
for release in releases:
release["pypy_version"] = Version(release["pypy_version"])
release["python_version"] = Version(release["python_version"])
self.releases = [
r for r in releases if not r["pypy_version"].is_prerelease and not r["pypy_version"].is_devrelease
]
self.arch = arch_str
def update_version_windows(self, spec: Specifier) -> ConfigWinCP:
if self.arch != "32":
raise RuntimeError("64 bit releases not supported yet on Windows")
releases = [r for r in self.releases if spec.contains(r["python_version"])]
releases = sorted(releases, key=lambda r: r["pypy_version"])
if not releases:
raise RuntimeError(f"PyPy Win {self.arch} not found for {spec}! {self.releases}")
release = releases[-1]
version = release["python_version"]
identifier = f"pp{version.major}{version.minor}-win32"
(url,) = [rf["download_url"] for rf in release["files"] if "" in rf["platform"] == "win32"]
return ConfigWinPP(
identifier=identifier,
version=f"{version.major}.{version.minor}",
arch="32",
url=url,
)
def update_version_macos(self, spec: Specifier) -> ConfigMacOS:
if self.arch != "64":
raise RuntimeError("Other archs not supported yet on macOS")
releases = [r for r in self.releases if spec.contains(r["python_version"])]
releases = sorted(releases, key=lambda r: r["pypy_version"])
if not releases:
raise RuntimeError(f"PyPy macOS {self.arch} not found for {spec}!")
release = releases[-1]
version = release["python_version"]
identifier = f"pp{version.major}{version.minor}-macosx_x86_64"
(url,) = [
rf["download_url"] for rf in release["files"] if "" in rf["platform"] == "darwin" and rf["arch"] == "x64"
]
return ConfigMacOS(
identifier=identifier,
version=f"{version.major}.{version.minor}",
url=url,
)
class CPythonVersions:
def __init__(self, plat_arch: str, file_ident: str) -> None:
response = requests.get("https://www.python.org/api/v2/downloads/release/?is_published=true")
response.raise_for_status()
releases_info = response.json()
self.versions_dict: Dict[Version, int] = {}
for release in releases_info:
# Removing the prefix, Python 3.9 would use: release["name"].removeprefix("Python ")
version = Version(release["name"][7:])
if not version.is_prerelease and not version.is_devrelease:
uri = int(release["resource_uri"].rstrip("/").split("/")[-1])
self.versions_dict[version] = uri
self.file_ident = file_ident
self.plat_arch = plat_arch
def update_version_macos(self, spec: Specifier) -> Optional[ConfigMacOS]:
sorted_versions = sorted(v for v in self.versions_dict if spec.contains(v))
for version in reversed(sorted_versions):
# Find the first patch version that contains the requested file
uri = self.versions_dict[version]
response = requests.get(f"https://www.python.org/api/v2/downloads/release_file/?release={uri}")
response.raise_for_status()
file_info = response.json()
urls = [rf["url"] for rf in file_info if self.file_ident in rf["url"]]
if urls:
return ConfigMacOS(
identifier=f"cp{version.major}{version.minor}-{self.plat_arch}",
version=f"{version.major}.{version.minor}",
url=urls[0],
)
return None
# This is a universal interface to all the above Versions classes. Given an
# identifier, it updates a config dict.
class AllVersions:
def __init__(self) -> None:
self.windows_32 = WindowsVersions("32")
self.windows_64 = WindowsVersions("64")
self.windows_pypy = PyPyVersions("32")
self.macos_6 = CPythonVersions(plat_arch="macosx_x86_64", file_ident="macosx10.6.pkg")
self.macos_9 = CPythonVersions(plat_arch="macosx_x86_64", file_ident="macosx10.9.pkg")
self.macos_u2 = CPythonVersions(plat_arch="macosx_universal2", file_ident="macos11.0.pkg")
self.macos_pypy = PyPyVersions("64")
def update_config(self, config: Dict[str, str]) -> None:
identifier = config["identifier"]
version = Version(config["version"])
spec = Specifier(f"=={version.major}.{version.minor}.*")
log.info(f"Reading in '{identifier}' -> {spec} @ {version}")
orig_config = copy.copy(config)
config_update: Optional[AnyConfig]
# We need to use ** in update due to MyPy (probably a bug)
if "macosx_x86_64" in identifier:
if identifier.startswith("pp"):
config_update = self.macos_pypy.update_version_macos(spec)
else:
config_update = self.macos_9.update_version_macos(spec) or self.macos_6.update_version_macos(spec)
assert config_update is not None, f"MacOS {spec} not found!"
config.update(**config_update)
elif "win32" in identifier:
if identifier.startswith("pp"):
config.update(**self.windows_pypy.update_version_windows(spec))
else:
config_update = self.windows_32.update_version_windows(spec)
if config_update:
config.update(**config_update)
elif "win_amd64" in identifier:
config_update = self.windows_64.update_version_windows(spec)
if config_update:
config.update(**config_update)
if config != orig_config:
log.info(f" Updated {orig_config} to {config}")
@click.command()
@click.option("--force", is_flag=True)
@click.option("--level", default="INFO", type=click.Choice(["INFO", "DEBUG", "TRACE"], case_sensitive=False))
def update_pythons(force: bool, level: str) -> None:
logging.basicConfig(
level="INFO",
format="%(message)s",
datefmt="[%X]",
handlers=[RichHandler(rich_tracebacks=True, markup=True)],
)
log.setLevel(level)
all_versions = AllVersions()
toml_file_path = RESOURCES_DIR / "build-platforms.toml"
original_toml = toml_file_path.read_text()
configs = toml.loads(original_toml)
for config in configs["windows"]["python_configurations"]:
all_versions.update_config(config)
for config in configs["macos"]["python_configurations"]:
all_versions.update_config(config)
result_toml = toml.dumps(configs, encoder=InlineArrayDictEncoder()) # type: ignore
rich.print() # spacer
if original_toml == result_toml:
rich.print("[green]Check complete, Python configurations unchanged.")
return
rich.print("Python configurations updated.")
rich.print("Changes:")
rich.print()
toml_relpath = toml_file_path.relative_to(DIR).as_posix()
diff_lines = difflib.unified_diff(
original_toml.splitlines(keepends=True),
result_toml.splitlines(keepends=True),
fromfile=toml_relpath,
tofile=toml_relpath,
)
rich.print(Syntax("".join(diff_lines), "diff", theme="ansi_light"))
rich.print()
if force:
toml_file_path.write_text(result_toml)
rich.print("[green]TOML file updated.")
else:
rich.print("[yellow]File left unchanged. Use --force flag to update.")
if __name__ == "__main__":
update_pythons()
+1 -1
View File
@@ -1 +1 @@
__version__ = '1.7.4' __version__ = '1.8.0'
+52 -20
View File
@@ -5,18 +5,20 @@ import textwrap
import traceback import traceback
from configparser import ConfigParser from configparser import ConfigParser
from pathlib import Path from pathlib import Path
from typing import Any, Dict, List, Optional, Set, overload from typing import Dict, List, Optional, Set, Union, overload
import cibuildwheel import cibuildwheel
import cibuildwheel.linux import cibuildwheel.linux
import cibuildwheel.macos import cibuildwheel.macos
import cibuildwheel.windows import cibuildwheel.windows
from cibuildwheel.architecture import Architecture, allowed_architectures_check
from cibuildwheel.environment import EnvironmentParseError, parse_environment from cibuildwheel.environment import EnvironmentParseError, parse_environment
from cibuildwheel.typing import PLATFORMS, PlatformName, assert_never
from cibuildwheel.util import ( from cibuildwheel.util import (
Architecture,
BuildOptions, BuildOptions,
BuildSelector, BuildSelector,
DependencyConstraints, DependencyConstraints,
TestSelector,
Unbuffered, Unbuffered,
detect_ci_provider, detect_ci_provider,
resources_dir, resources_dir,
@@ -46,6 +48,8 @@ def get_option_from_environment(option_name: str, platform: Optional[str] = None
def main() -> None: def main() -> None:
platform: PlatformName
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Build wheels for all the platforms.', description='Build wheels for all the platforms.',
epilog=''' epilog='''
@@ -73,7 +77,7 @@ def main() -> None:
on this machine. Set this option to build an architecture on this machine. Set this option to build an architecture
via emulation, for example, using binfmt_misc and QEMU. via emulation, for example, using binfmt_misc and QEMU.
Default: auto. Default: auto.
Choices: auto, {} Choices: auto, native, all, {}
'''.format(", ".join(a.name for a in Architecture))) '''.format(", ".join(a.name for a in Architecture)))
parser.add_argument('--output-dir', parser.add_argument('--output-dir',
default=os.environ.get('CIBW_OUTPUT_DIR', 'wheelhouse'), default=os.environ.get('CIBW_OUTPUT_DIR', 'wheelhouse'),
@@ -91,6 +95,9 @@ def main() -> None:
parser.add_argument('--print-build-identifiers', parser.add_argument('--print-build-identifiers',
action='store_true', action='store_true',
help='Print the build identifiers matched by the current invocation and exit.') help='Print the build identifiers matched by the current invocation and exit.')
parser.add_argument('--allow-empty',
action='store_true',
help='Do not report an error code if the build does not match any wheels.')
args = parser.parse_args() args = parser.parse_args()
@@ -107,7 +114,7 @@ def main() -> None:
supported. You can run on your development machine or other CI providers using the supported. You can run on your development machine or other CI providers using the
--platform argument. Check --help output for more information. --platform argument. Check --help output for more information.
'''), file=sys.stderr) '''), file=sys.stderr)
exit(2) sys.exit(2)
if sys.platform.startswith('linux'): if sys.platform.startswith('linux'):
platform = 'linux' platform = 'linux'
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
@@ -118,7 +125,11 @@ def main() -> None:
print('cibuildwheel: Unable to detect platform from "sys.platform" in a CI environment. You can run ' print('cibuildwheel: Unable to detect platform from "sys.platform" in a CI environment. You can run '
'cibuildwheel using the --platform argument. Check --help output for more information.', 'cibuildwheel using the --platform argument. Check --help output for more information.',
file=sys.stderr) file=sys.stderr)
exit(2) sys.exit(2)
if platform not in PLATFORMS:
print(f'cibuildwheel: Unsupported platform: {platform}', file=sys.stderr)
sys.exit(2)
package_dir = Path(args.package_dir) package_dir = Path(args.package_dir)
output_dir = Path(args.output_dir) output_dir = Path(args.output_dir)
@@ -127,10 +138,13 @@ def main() -> None:
repair_command_default = 'auditwheel repair -w {dest_dir} {wheel}' repair_command_default = 'auditwheel repair -w {dest_dir} {wheel}'
elif platform == 'macos': elif platform == 'macos':
repair_command_default = 'delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}' repair_command_default = 'delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}'
else: elif platform == 'windows':
repair_command_default = '' repair_command_default = ''
else:
assert_never(platform)
build_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '') build_config, skip_config = os.environ.get('CIBW_BUILD', '*'), os.environ.get('CIBW_SKIP', '')
test_skip = os.environ.get('CIBW_TEST_SKIP', '')
environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform, default='') environment_config = get_option_from_environment('CIBW_ENVIRONMENT', platform=platform, default='')
before_all = get_option_from_environment('CIBW_BEFORE_ALL', platform=platform, default='') before_all = get_option_from_environment('CIBW_BEFORE_ALL', platform=platform, default='')
before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform) before_build = get_option_from_environment('CIBW_BEFORE_BUILD', platform=platform)
@@ -142,14 +156,15 @@ def main() -> None:
test_extras = get_option_from_environment('CIBW_TEST_EXTRAS', platform=platform, default='') test_extras = get_option_from_environment('CIBW_TEST_EXTRAS', platform=platform, default='')
build_verbosity_str = get_option_from_environment('CIBW_BUILD_VERBOSITY', platform=platform, default='') build_verbosity_str = get_option_from_environment('CIBW_BUILD_VERBOSITY', platform=platform, default='')
build_selector = BuildSelector(build_config, skip_config) build_selector = BuildSelector(build_config=build_config, skip_config=skip_config)
test_selector = TestSelector(skip_config=test_skip)
try: try:
environment = parse_environment(environment_config) environment = parse_environment(environment_config)
except (EnvironmentParseError, ValueError): except (EnvironmentParseError, ValueError):
print(f'cibuildwheel: Malformed environment option "{environment_config}"', file=sys.stderr) print(f'cibuildwheel: Malformed environment option "{environment_config}"', file=sys.stderr)
traceback.print_exc(None, sys.stderr) traceback.print_exc(None, sys.stderr)
exit(2) sys.exit(2)
if dependency_versions == 'pinned': if dependency_versions == 'pinned':
dependency_constraints: Optional[DependencyConstraints] = DependencyConstraints.with_defaults() dependency_constraints: Optional[DependencyConstraints] = DependencyConstraints.with_defaults()
@@ -174,7 +189,7 @@ def main() -> None:
if not any((package_dir / name).exists() if not any((package_dir / name).exists()
for name in ["setup.py", "setup.cfg", "pyproject.toml"]): for name in ["setup.py", "setup.cfg", "pyproject.toml"]):
print('cibuildwheel: Could not find setup.py, setup.cfg or pyproject.toml at root of package', file=sys.stderr) print('cibuildwheel: Could not find setup.py, setup.cfg or pyproject.toml at root of package', file=sys.stderr)
exit(2) sys.exit(2)
if args.archs is not None: if args.archs is not None:
archs_config_str = args.archs archs_config_str = args.archs
@@ -182,9 +197,12 @@ def main() -> None:
archs_config_str = get_option_from_environment('CIBW_ARCHS', platform=platform, default='auto') archs_config_str = get_option_from_environment('CIBW_ARCHS', platform=platform, default='auto')
archs = Architecture.parse_config(archs_config_str, platform=platform) archs = Architecture.parse_config(archs_config_str, platform=platform)
identifiers = get_build_identifiers(platform, build_selector, archs)
if args.print_build_identifiers: if args.print_build_identifiers:
print_build_identifiers(platform, build_selector, archs) for identifier in identifiers:
exit(0) print(identifier)
sys.exit(0)
manylinux_images: Optional[Dict[str, str]] = None manylinux_images: Optional[Dict[str, str]] = None
if platform == 'linux': if platform == 'linux':
@@ -227,6 +245,7 @@ def main() -> None:
before_all=before_all, before_all=before_all,
build_verbosity=build_verbosity, build_verbosity=build_verbosity,
build_selector=build_selector, build_selector=build_selector,
test_selector=test_selector,
repair_command=repair_command, repair_command=repair_command,
environment=environment, environment=environment,
dependency_constraints=dependency_constraints, dependency_constraints=dependency_constraints,
@@ -238,6 +257,17 @@ def main() -> None:
print_preamble(platform, build_options) print_preamble(platform, build_options)
try:
allowed_architectures_check(platform, build_options.architectures)
except ValueError as err:
print("cibuildwheel:", *err.args, file=sys.stderr)
sys.exit(4)
if not identifiers:
print(f'cibuildwheel: No build identifiers selected: {build_selector}', file=sys.stderr)
if not args.allow_empty:
sys.exit(3)
if not output_dir.exists(): if not output_dir.exists():
output_dir.mkdir(parents=True) output_dir.mkdir(parents=True)
@@ -248,8 +278,7 @@ def main() -> None:
elif platform == 'macos': elif platform == 'macos':
cibuildwheel.macos.build(build_options) cibuildwheel.macos.build(build_options)
else: else:
print(f'cibuildwheel: Unsupported platform: {platform}', file=sys.stderr) assert_never(platform)
exit(2)
def detect_obsolete_options() -> None: def detect_obsolete_options() -> None:
@@ -263,7 +292,7 @@ def detect_obsolete_options() -> None:
os.environ[alternative] = os.environ[deprecated] os.environ[alternative] = os.environ[deprecated]
else: else:
print(f"Option '{alternative}' is not empty. Please unset '{deprecated}'") print(f"Option '{alternative}' is not empty. Please unset '{deprecated}'")
exit(2) sys.exit(2)
# Check for deprecated identifiers in 'CIBW_BUILD' and 'CIBW_SKIP' options # Check for deprecated identifiers in 'CIBW_BUILD' and 'CIBW_SKIP' options
for option in ['CIBW_BUILD', 'CIBW_SKIP']: for option in ['CIBW_BUILD', 'CIBW_SKIP']:
@@ -299,19 +328,22 @@ def print_preamble(platform: str, build_options: BuildOptions) -> None:
print('\nHere we go!\n') print('\nHere we go!\n')
def print_build_identifiers( def get_build_identifiers(
platform: str, build_selector: BuildSelector, architectures: Set[Architecture] platform: PlatformName, build_selector: BuildSelector, architectures: Set[Architecture]
) -> None: ) -> List[str]:
python_configurations: List[Any] = [] python_configurations: Union[List[cibuildwheel.linux.PythonConfiguration],
List[cibuildwheel.windows.PythonConfiguration],
List[cibuildwheel.macos.PythonConfiguration]]
if platform == 'linux': if platform == 'linux':
python_configurations = cibuildwheel.linux.get_python_configurations(build_selector, architectures) python_configurations = cibuildwheel.linux.get_python_configurations(build_selector, architectures)
elif platform == 'windows': elif platform == 'windows':
python_configurations = cibuildwheel.windows.get_python_configurations(build_selector, architectures) python_configurations = cibuildwheel.windows.get_python_configurations(build_selector, architectures)
elif platform == 'macos': elif platform == 'macos':
python_configurations = cibuildwheel.macos.get_python_configurations(build_selector, architectures) python_configurations = cibuildwheel.macos.get_python_configurations(build_selector, architectures)
else:
assert_never(platform)
for config in python_configurations: return [config.identifier for config in python_configurations]
print(config.identifier)
def detect_warnings(platform: str, build_options: BuildOptions) -> List[str]: def detect_warnings(platform: str, build_options: BuildOptions) -> List[str]:
+99
View File
@@ -0,0 +1,99 @@
import functools
import platform as platform_module
import re
from enum import Enum
from typing import Set
from .typing import PlatformName, assert_never
PRETTY_NAMES = {'linux': 'Linux', 'macos': 'macOS', 'windows': 'Windows'}
@functools.total_ordering
class Architecture(Enum):
value: str
# mac/linux archs
x86_64 = 'x86_64'
# linux archs
i686 = 'i686'
aarch64 = 'aarch64'
ppc64le = 'ppc64le'
s390x = 's390x'
# mac archs
universal2 = 'universal2'
arm64 = 'arm64'
# windows archs
x86 = 'x86'
AMD64 = 'AMD64'
# Allow this to be sorted
def __lt__(self, other: "Architecture") -> bool:
return self.value < other.value
@staticmethod
def parse_config(config: str, platform: PlatformName) -> 'Set[Architecture]':
result = set()
for arch_str in re.split(r'[\s,]+', config):
if arch_str == 'auto':
result |= Architecture.auto_archs(platform=platform)
elif arch_str == 'native':
result.add(Architecture(platform_module.machine()))
elif arch_str == 'all':
result |= Architecture.all_archs(platform=platform)
else:
result.add(Architecture(arch_str))
return result
@staticmethod
def auto_archs(platform: PlatformName) -> 'Set[Architecture]':
native_architecture = Architecture(platform_module.machine())
result = {native_architecture}
if platform == 'linux' and native_architecture == Architecture.x86_64:
# x86_64 machines can run i686 docker containers
result.add(Architecture.i686)
if platform == 'windows' and native_architecture == Architecture.AMD64:
result.add(Architecture.x86)
if platform == 'macos' and native_architecture == Architecture.arm64:
# arm64 can build and test both archs of a universal2 wheel.
result.add(Architecture.universal2)
return result
@staticmethod
def all_archs(platform: PlatformName) -> 'Set[Architecture]':
if platform == 'linux':
return {Architecture.x86_64, Architecture.i686, Architecture.aarch64, Architecture.ppc64le, Architecture.s390x}
elif platform == 'macos':
return {Architecture.x86_64, Architecture.arm64, Architecture.universal2}
elif platform == 'windows':
return {Architecture.x86, Architecture.AMD64}
else:
assert_never(platform)
def allowed_architectures_check(
platform: PlatformName,
architectures: Set[Architecture],
) -> None:
allowed_architectures = Architecture.all_archs(platform)
msg = f'{PRETTY_NAMES[platform]} only supports {sorted(allowed_architectures)} at the moment.'
if platform != 'linux':
msg += ' If you want to set emulation architectures on Linux, use CIBW_ARCHS_LINUX instead.'
if not architectures <= allowed_architectures:
msg = f'Invalid archs option {architectures}. ' + msg
raise ValueError(msg)
if not architectures:
msg = 'Empty archs option set. ' + msg
raise ValueError(msg)
+3
View File
@@ -30,6 +30,9 @@ class DockerContainer:
bash_stdout: IO[bytes] bash_stdout: IO[bytes]
def __init__(self, docker_image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None): def __init__(self, docker_image: str, simulate_32_bit: bool = False, cwd: Optional[PathOrStr] = None):
if not docker_image:
raise ValueError("Must have a non-empty docker image to run.")
self.docker_image = docker_image self.docker_image = docker_image
self.simulate_32_bit = simulate_32_bit self.simulate_32_bit = simulate_32_bit
self.cwd = cwd self.cwd = cwd
+24
View File
@@ -0,0 +1,24 @@
"""
These are utilities for the `/bin` scripts, not for the `cibuildwheel` program.
"""
from typing import Any, Dict
import toml.encoder
from packaging.version import Version
class InlineArrayDictEncoder(toml.encoder.TomlEncoder): # type: ignore
def __init__(self) -> None:
super().__init__()
self.dump_funcs[Version] = lambda v: f'"{v}"'
def dump_sections(self, o: Dict[str, Any], sup: str) -> Any:
if all(isinstance(a, list) for a in o.values()):
val = ""
for k, v in o.items():
inner = ",\n ".join(self.dump_inline_table(d_i).strip() for d_i in v)
val += f"{k} = [\n {inner},\n]\n"
return val, self._dict()
else:
return super().dump_sections(o, sup)
+15 -45
View File
@@ -4,17 +4,18 @@ import textwrap
from pathlib import Path, PurePath from pathlib import Path, PurePath
from typing import List, NamedTuple, Set from typing import List, NamedTuple, Set
from .architecture import Architecture
from .docker_container import DockerContainer from .docker_container import DockerContainer
from .logger import log from .logger import log
from .typing import PathOrStr from .typing import PathOrStr
from .util import ( from .util import (
Architecture,
BuildOptions, BuildOptions,
BuildSelector, BuildSelector,
NonPlatformWheelError, NonPlatformWheelError,
allowed_architectures_check,
get_build_verbosity_extra_flags, get_build_verbosity_extra_flags,
prepare_command, prepare_command,
read_python_configs,
resources_dir,
) )
@@ -29,42 +30,13 @@ class PythonConfiguration(NamedTuple):
def get_python_configurations( def get_python_configurations(
build_selector: BuildSelector, architectures: Set[Architecture] build_selector: BuildSelector,
architectures: Set[Architecture]
) -> List[PythonConfiguration]: ) -> List[PythonConfiguration]:
python_configurations = [
PythonConfiguration(version='2.7', identifier='cp27-manylinux_x86_64', path_str='/opt/python/cp27-cp27m'), full_python_configs = read_python_configs('linux')
PythonConfiguration(version='2.7', identifier='cp27-manylinux_x86_64', path_str='/opt/python/cp27-cp27mu'),
PythonConfiguration(version='3.5', identifier='cp35-manylinux_x86_64', path_str='/opt/python/cp35-cp35m'), python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
PythonConfiguration(version='3.6', identifier='cp36-manylinux_x86_64', path_str='/opt/python/cp36-cp36m'),
PythonConfiguration(version='3.7', identifier='cp37-manylinux_x86_64', path_str='/opt/python/cp37-cp37m'),
PythonConfiguration(version='3.8', identifier='cp38-manylinux_x86_64', path_str='/opt/python/cp38-cp38'),
PythonConfiguration(version='3.9', identifier='cp39-manylinux_x86_64', path_str='/opt/python/cp39-cp39'),
PythonConfiguration(version='2.7', identifier='cp27-manylinux_i686', path_str='/opt/python/cp27-cp27m'),
PythonConfiguration(version='2.7', identifier='cp27-manylinux_i686', path_str='/opt/python/cp27-cp27mu'),
PythonConfiguration(version='3.5', identifier='cp35-manylinux_i686', path_str='/opt/python/cp35-cp35m'),
PythonConfiguration(version='3.6', identifier='cp36-manylinux_i686', path_str='/opt/python/cp36-cp36m'),
PythonConfiguration(version='3.7', identifier='cp37-manylinux_i686', path_str='/opt/python/cp37-cp37m'),
PythonConfiguration(version='3.8', identifier='cp38-manylinux_i686', path_str='/opt/python/cp38-cp38'),
PythonConfiguration(version='3.9', identifier='cp39-manylinux_i686', path_str='/opt/python/cp39-cp39'),
PythonConfiguration(version='2.7', identifier='pp27-manylinux_x86_64', path_str='/opt/python/pp27-pypy_73'),
PythonConfiguration(version='3.6', identifier='pp36-manylinux_x86_64', path_str='/opt/python/pp36-pypy36_pp73'),
PythonConfiguration(version='3.7', identifier='pp37-manylinux_x86_64', path_str='/opt/python/pp37-pypy37_pp73'),
PythonConfiguration(version='3.5', identifier='cp35-manylinux_aarch64', path_str='/opt/python/cp35-cp35m'),
PythonConfiguration(version='3.6', identifier='cp36-manylinux_aarch64', path_str='/opt/python/cp36-cp36m'),
PythonConfiguration(version='3.7', identifier='cp37-manylinux_aarch64', path_str='/opt/python/cp37-cp37m'),
PythonConfiguration(version='3.8', identifier='cp38-manylinux_aarch64', path_str='/opt/python/cp38-cp38'),
PythonConfiguration(version='3.9', identifier='cp39-manylinux_aarch64', path_str='/opt/python/cp39-cp39'),
PythonConfiguration(version='3.5', identifier='cp35-manylinux_ppc64le', path_str='/opt/python/cp35-cp35m'),
PythonConfiguration(version='3.6', identifier='cp36-manylinux_ppc64le', path_str='/opt/python/cp36-cp36m'),
PythonConfiguration(version='3.7', identifier='cp37-manylinux_ppc64le', path_str='/opt/python/cp37-cp37m'),
PythonConfiguration(version='3.8', identifier='cp38-manylinux_ppc64le', path_str='/opt/python/cp38-cp38'),
PythonConfiguration(version='3.9', identifier='cp39-manylinux_ppc64le', path_str='/opt/python/cp39-cp39'),
PythonConfiguration(version='3.5', identifier='cp35-manylinux_s390x', path_str='/opt/python/cp35-cp35m'),
PythonConfiguration(version='3.6', identifier='cp36-manylinux_s390x', path_str='/opt/python/cp36-cp36m'),
PythonConfiguration(version='3.7', identifier='cp37-manylinux_s390x', path_str='/opt/python/cp37-cp37m'),
PythonConfiguration(version='3.8', identifier='cp38-manylinux_s390x', path_str='/opt/python/cp38-cp38'),
PythonConfiguration(version='3.9', identifier='cp39-manylinux_s390x', path_str='/opt/python/cp39-cp39'),
]
# return all configurations whose arch is in our `architectures` set, # return all configurations whose arch is in our `architectures` set,
# and match the build/skip rules # and match the build/skip rules
@@ -76,8 +48,6 @@ def get_python_configurations(
def build(options: BuildOptions) -> None: def build(options: BuildOptions) -> None:
allowed_architectures_check("linux", options)
try: try:
subprocess.check_output(['docker', '--version']) subprocess.check_output(['docker', '--version'])
except Exception: except Exception:
@@ -85,7 +55,7 @@ def build(options: BuildOptions) -> None:
'If you\'re building on Travis CI, add `services: [docker]` to your .travis.yml.' 'If you\'re building on Travis CI, add `services: [docker]` to your .travis.yml.'
'If you\'re building on Circle CI in Linux, add a `setup_remote_docker` step to your .circleci/config.yml', 'If you\'re building on Circle CI in Linux, add a `setup_remote_docker` step to your .circleci/config.yml',
file=sys.stderr) file=sys.stderr)
exit(2) sys.exit(2)
assert options.manylinux_images is not None assert options.manylinux_images is not None
python_configurations = get_python_configurations(options.build_selector, options.architectures) python_configurations = get_python_configurations(options.build_selector, options.architectures)
@@ -136,7 +106,7 @@ def build(options: BuildOptions) -> None:
if config.identifier.startswith("pp"): if config.identifier.startswith("pp"):
# Patch PyPy to make sure headers get installed into a venv # Patch PyPy to make sure headers get installed into a venv
patch_version = '_27' if config.version == '2.7' else '' patch_version = '_27' if config.version == '2.7' else ''
patch_path = Path(__file__).absolute().parent / 'resources' / f'pypy_venv{patch_version}.patch' patch_path = resources_dir / f'pypy_venv{patch_version}.patch'
patch_docker_path = PurePath('/pypy_venv.patch') patch_docker_path = PurePath('/pypy_venv.patch')
docker.copy_into(patch_path, patch_docker_path) docker.copy_into(patch_path, patch_docker_path)
try: try:
@@ -165,12 +135,12 @@ def build(options: BuildOptions) -> None:
which_python = docker.call(['which', 'python'], env=env, capture_output=True).strip() which_python = docker.call(['which', 'python'], env=env, capture_output=True).strip()
if PurePath(which_python) != python_bin / 'python': if PurePath(which_python) != python_bin / 'python':
print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr) print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
exit(1) sys.exit(1)
which_pip = docker.call(['which', 'pip'], env=env, capture_output=True).strip() which_pip = docker.call(['which', 'pip'], env=env, capture_output=True).strip()
if PurePath(which_pip) != python_bin / 'pip': if PurePath(which_pip) != python_bin / 'pip':
print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr) print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr)
exit(1) sys.exit(1)
if options.before_build: if options.before_build:
log.step('Running before_build...') log.step('Running before_build...')
@@ -210,7 +180,7 @@ def build(options: BuildOptions) -> None:
repaired_wheels = docker.glob(repaired_wheel_dir, '*.whl') repaired_wheels = docker.glob(repaired_wheel_dir, '*.whl')
if options.test_command: if options.test_command and options.test_selector(config.identifier):
log.step('Testing wheel...') log.step('Testing wheel...')
# set up a virtual environment to install and test from, to make sure # set up a virtual environment to install and test from, to make sure
@@ -260,7 +230,7 @@ def build(options: BuildOptions) -> None:
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}') log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}')
troubleshoot(options.package_dir, error) troubleshoot(options.package_dir, error)
exit(1) sys.exit(1)
def troubleshoot(package_dir: Path, error: Exception) -> None: def troubleshoot(package_dir: Path, error: Exception) -> None:
+12 -24
View File
@@ -8,20 +8,21 @@ import tempfile
from pathlib import Path from pathlib import Path
from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, cast from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Set, Tuple, cast
from .architecture import Architecture
from .environment import ParsedEnvironment from .environment import ParsedEnvironment
from .logger import log from .logger import log
from .typing import PathOrStr from .typing import PathOrStr
from .util import ( from .util import (
Architecture,
BuildOptions, BuildOptions,
BuildSelector, BuildSelector,
NonPlatformWheelError, NonPlatformWheelError,
allowed_architectures_check,
download, download,
get_build_verbosity_extra_flags, get_build_verbosity_extra_flags,
get_pip_script, get_pip_script,
install_certifi_script, install_certifi_script,
prepare_command, prepare_command,
read_python_configs,
resources_dir,
unwrap, unwrap,
) )
@@ -58,21 +59,10 @@ class PythonConfiguration(NamedTuple):
def get_python_configurations(build_selector: BuildSelector, def get_python_configurations(build_selector: BuildSelector,
architectures: Set[Architecture]) -> List[PythonConfiguration]: architectures: Set[Architecture]) -> List[PythonConfiguration]:
python_configurations = [
# CPython full_python_configs = read_python_configs('macos')
PythonConfiguration(version='2.7', identifier='cp27-macosx_x86_64', url='https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg'),
PythonConfiguration(version='3.5', identifier='cp35-macosx_x86_64', url='https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg'), python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
PythonConfiguration(version='3.6', identifier='cp36-macosx_x86_64', url='https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg'),
PythonConfiguration(version='3.7', identifier='cp37-macosx_x86_64', url='https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg'),
PythonConfiguration(version='3.8', identifier='cp38-macosx_x86_64', url='https://www.python.org/ftp/python/3.8.7/python-3.8.7-macosx10.9.pkg'),
PythonConfiguration(version='3.9', identifier='cp39-macosx_x86_64', url='https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg'),
PythonConfiguration(version='3.9', identifier='cp39-macosx_arm64', url='https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg'),
PythonConfiguration(version='3.9', identifier='cp39-macosx_universal2', url='https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg'),
# PyPy
PythonConfiguration(version='2.7', identifier='pp27-macosx_x86_64', url='https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2'),
PythonConfiguration(version='3.6', identifier='pp36-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2'),
PythonConfiguration(version='3.7', identifier='pp37-macosx_x86_64', url='https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2'),
]
# filter out configs that don't match any of the selected architectures # filter out configs that don't match any of the selected architectures
python_configurations = [c for c in python_configurations python_configurations = [c for c in python_configurations
@@ -163,7 +153,7 @@ def install_pypy(version: str, url: str) -> Path:
call(['tar', '-C', '/tmp', '-xf', downloaded_tar_bz2]) call(['tar', '-C', '/tmp', '-xf', downloaded_tar_bz2])
# Patch PyPy to make sure headers get installed into a venv # Patch PyPy to make sure headers get installed into a venv
patch_version = '_27' if version == '2.7' else '' patch_version = '_27' if version == '2.7' else ''
patch_path = Path(__file__).absolute().parent / 'resources' / f'pypy_venv{patch_version}.patch' patch_path = resources_dir / f'pypy_venv{patch_version}.patch'
call(['patch', '--force', '-p1', '-d', installation_path, '-i', patch_path]) call(['patch', '--force', '-p1', '-d', installation_path, '-i', patch_path])
installation_bin_path = installation_path / 'bin' installation_bin_path = installation_path / 'bin'
@@ -211,7 +201,7 @@ def setup_python(python_configuration: PythonConfiguration,
which_python = subprocess.check_output(['which', 'python'], env=env, universal_newlines=True).strip() which_python = subprocess.check_output(['which', 'python'], env=env, universal_newlines=True).strip()
if which_python != '/tmp/cibw_bin/python': if which_python != '/tmp/cibw_bin/python':
print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr) print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
exit(1) sys.exit(1)
# install pip & wheel # install pip & wheel
call(['python', get_pip_script, *dependency_constraint_flags], env=env, cwd="/tmp") call(['python', get_pip_script, *dependency_constraint_flags], env=env, cwd="/tmp")
@@ -221,7 +211,7 @@ def setup_python(python_configuration: PythonConfiguration,
which_pip = subprocess.check_output(['which', 'pip'], env=env, universal_newlines=True).strip() which_pip = subprocess.check_output(['which', 'pip'], env=env, universal_newlines=True).strip()
if which_pip != '/tmp/cibw_bin/pip': if which_pip != '/tmp/cibw_bin/pip':
print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr) print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr)
exit(1) sys.exit(1)
# Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it. # Set MACOSX_DEPLOYMENT_TARGET to 10.9, if the user didn't set it.
# CPython 3.5 defaults to 10.6, and pypy defaults to 10.7, causing # CPython 3.5 defaults to 10.6, and pypy defaults to 10.7, causing
@@ -254,8 +244,6 @@ def setup_python(python_configuration: PythonConfiguration,
def build(options: BuildOptions) -> None: def build(options: BuildOptions) -> None:
allowed_architectures_check("macos", options)
temp_dir = Path(tempfile.mkdtemp(prefix='cibuildwheel')) temp_dir = Path(tempfile.mkdtemp(prefix='cibuildwheel'))
built_wheel_dir = temp_dir / 'built_wheel' built_wheel_dir = temp_dir / 'built_wheel'
repaired_wheel_dir = temp_dir / 'repaired_wheel' repaired_wheel_dir = temp_dir / 'repaired_wheel'
@@ -343,7 +331,7 @@ def build(options: BuildOptions) -> None:
log.step_end() log.step_end()
if options.test_command: if options.test_command and options.test_selector(config.identifier):
machine_arch = platform.machine() machine_arch = platform.machine()
testing_archs: List[str] = [] testing_archs: List[str] = []
@@ -447,4 +435,4 @@ def build(options: BuildOptions) -> None:
log.build_end() log.build_end()
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}') log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}')
exit(1) sys.exit(1)
@@ -0,0 +1,69 @@
[linux]
python_configurations = [
{ identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
{ identifier = "cp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
{ identifier = "cp35-manylinux_x86_64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
{ identifier = "cp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
{ identifier = "cp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
{ identifier = "cp38-manylinux_x86_64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
{ identifier = "cp39-manylinux_x86_64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
{ identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27m" },
{ identifier = "cp27-manylinux_i686", version = "2.7", path_str = "/opt/python/cp27-cp27mu" },
{ identifier = "cp35-manylinux_i686", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
{ identifier = "cp36-manylinux_i686", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
{ identifier = "cp37-manylinux_i686", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
{ identifier = "cp38-manylinux_i686", version = "3.8", path_str = "/opt/python/cp38-cp38" },
{ identifier = "cp39-manylinux_i686", version = "3.9", path_str = "/opt/python/cp39-cp39" },
{ identifier = "pp27-manylinux_x86_64", version = "2.7", path_str = "/opt/python/pp27-pypy_73" },
{ identifier = "pp36-manylinux_x86_64", version = "3.6", path_str = "/opt/python/pp36-pypy36_pp73" },
{ identifier = "pp37-manylinux_x86_64", version = "3.7", path_str = "/opt/python/pp37-pypy37_pp73" },
{ identifier = "cp35-manylinux_aarch64", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
{ identifier = "cp36-manylinux_aarch64", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
{ identifier = "cp37-manylinux_aarch64", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
{ identifier = "cp38-manylinux_aarch64", version = "3.8", path_str = "/opt/python/cp38-cp38" },
{ identifier = "cp39-manylinux_aarch64", version = "3.9", path_str = "/opt/python/cp39-cp39" },
{ identifier = "cp35-manylinux_ppc64le", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
{ identifier = "cp36-manylinux_ppc64le", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
{ identifier = "cp37-manylinux_ppc64le", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
{ identifier = "cp38-manylinux_ppc64le", version = "3.8", path_str = "/opt/python/cp38-cp38" },
{ identifier = "cp39-manylinux_ppc64le", version = "3.9", path_str = "/opt/python/cp39-cp39" },
{ identifier = "cp35-manylinux_s390x", version = "3.5", path_str = "/opt/python/cp35-cp35m" },
{ identifier = "cp36-manylinux_s390x", version = "3.6", path_str = "/opt/python/cp36-cp36m" },
{ identifier = "cp37-manylinux_s390x", version = "3.7", path_str = "/opt/python/cp37-cp37m" },
{ identifier = "cp38-manylinux_s390x", version = "3.8", path_str = "/opt/python/cp38-cp38" },
{ identifier = "cp39-manylinux_s390x", version = "3.9", path_str = "/opt/python/cp39-cp39" },
]
[macos]
python_configurations = [
{ identifier = "cp27-macosx_x86_64", version = "2.7", url = "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg" },
{ identifier = "cp35-macosx_x86_64", version = "3.5", url = "https://www.python.org/ftp/python/3.5.4/python-3.5.4-macosx10.6.pkg" },
{ identifier = "cp36-macosx_x86_64", version = "3.6", url = "https://www.python.org/ftp/python/3.6.8/python-3.6.8-macosx10.9.pkg" },
{ identifier = "cp37-macosx_x86_64", version = "3.7", url = "https://www.python.org/ftp/python/3.7.9/python-3.7.9-macosx10.9.pkg" },
{ identifier = "cp38-macosx_x86_64", version = "3.8", url = "https://www.python.org/ftp/python/3.8.7/python-3.8.7-macosx10.9.pkg" },
{ identifier = "cp39-macosx_x86_64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg" },
{ identifier = "cp39-macosx_arm64", version = "3.9", url = "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg" },
{ identifier = "cp39-macosx_universal2", version = "3.9", url = "https://www.python.org/ftp/python/3.9.1/python-3.9.1-macos11.0.pkg" },
{ identifier = "pp27-macosx_x86_64", version = "2.7", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-osx64.tar.bz2" },
{ identifier = "pp36-macosx_x86_64", version = "3.6", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-osx64.tar.bz2" },
{ identifier = "pp37-macosx_x86_64", version = "3.7", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-osx64.tar.bz2" },
]
[windows]
python_configurations = [
{ identifier = "cp27-win32", version = "2.7.18", arch = "32" },
{ identifier = "cp27-win_amd64", version = "2.7.18", arch = "64" },
{ identifier = "cp35-win32", version = "3.5.4", arch = "32" },
{ identifier = "cp35-win_amd64", version = "3.5.4", arch = "64" },
{ identifier = "cp36-win32", version = "3.6.8", arch = "32" },
{ identifier = "cp36-win_amd64", version = "3.6.8", arch = "64" },
{ identifier = "cp37-win32", version = "3.7.9", arch = "32" },
{ identifier = "cp37-win_amd64", version = "3.7.9", arch = "64" },
{ identifier = "cp38-win32", version = "3.8.7", arch = "32" },
{ identifier = "cp38-win_amd64", version = "3.8.7", arch = "64" },
{ identifier = "cp39-win32", version = "3.9.1", arch = "32" },
{ identifier = "cp39-win_amd64", version = "3.9.1", arch = "64" },
{ identifier = "pp27-win32", version = "2.7", arch = "32", url = "https://downloads.python.org/pypy/pypy2.7-v7.3.3-win32.zip" },
{ identifier = "pp36-win32", version = "3.6", arch = "32", url = "https://downloads.python.org/pypy/pypy3.6-v7.3.3-win32.zip" },
{ identifier = "pp37-win32", version = "3.7", arch = "32", url = "https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip" },
]
@@ -37,7 +37,7 @@ six==1.15.0
# virtualenv # virtualenv
typing==3.7.4.3 typing==3.7.4.3
# via importlib-resources # via importlib-resources
virtualenv==20.2.2 virtualenv==20.4.0
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
wheel==0.36.2 wheel==0.36.2
# via # via
@@ -18,7 +18,7 @@ importlib-resources==3.2.1
# via virtualenv # via virtualenv
six==1.15.0 six==1.15.0
# via virtualenv # via virtualenv
virtualenv==20.2.2 virtualenv==20.4.0
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
wheel==0.36.2 wheel==0.36.2
# via # via
@@ -12,15 +12,15 @@ distlib==0.3.1
# via virtualenv # via virtualenv
filelock==3.0.12 filelock==3.0.12
# via virtualenv # via virtualenv
importlib-metadata==3.3.0 importlib-metadata==3.4.0
# via virtualenv # via virtualenv
importlib-resources==4.1.1 importlib-resources==5.1.0
# via virtualenv # via virtualenv
six==1.15.0 six==1.15.0
# via virtualenv # via virtualenv
typing-extensions==3.7.4.3 typing-extensions==3.7.4.3
# via importlib-metadata # via importlib-metadata
virtualenv==20.2.2 virtualenv==20.4.0
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
wheel==0.36.2 wheel==0.36.2
# via # via
@@ -34,5 +34,5 @@ zipp==3.4.0
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==20.3.3 pip==20.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
setuptools==51.1.1 setuptools==51.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
@@ -12,13 +12,13 @@ distlib==0.3.1
# via virtualenv # via virtualenv
filelock==3.0.12 filelock==3.0.12
# via virtualenv # via virtualenv
importlib-metadata==3.3.0 importlib-metadata==3.4.0
# via virtualenv # via virtualenv
six==1.15.0 six==1.15.0
# via virtualenv # via virtualenv
typing-extensions==3.7.4.3 typing-extensions==3.7.4.3
# via importlib-metadata # via importlib-metadata
virtualenv==20.2.2 virtualenv==20.4.0
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
wheel==0.36.2 wheel==0.36.2
# via # via
@@ -30,5 +30,5 @@ zipp==3.4.0
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==20.3.3 pip==20.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
setuptools==51.1.1 setuptools==51.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
@@ -14,7 +14,7 @@ filelock==3.0.12
# via virtualenv # via virtualenv
six==1.15.0 six==1.15.0
# via virtualenv # via virtualenv
virtualenv==20.2.2 virtualenv==20.4.0
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
wheel==0.36.2 wheel==0.36.2
# via # via
@@ -24,5 +24,5 @@ wheel==0.36.2
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==20.3.3 pip==20.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
setuptools==51.1.1 setuptools==51.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
@@ -14,7 +14,7 @@ filelock==3.0.12
# via virtualenv # via virtualenv
six==1.15.0 six==1.15.0
# via virtualenv # via virtualenv
virtualenv==20.2.2 virtualenv==20.4.0
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
wheel==0.36.2 wheel==0.36.2
# via # via
@@ -24,5 +24,5 @@ wheel==0.36.2
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==20.3.3 pip==20.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
setuptools==51.1.1 setuptools==51.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
+2 -2
View File
@@ -14,7 +14,7 @@ filelock==3.0.12
# via virtualenv # via virtualenv
six==1.15.0 six==1.15.0
# via virtualenv # via virtualenv
virtualenv==20.2.2 virtualenv==20.4.0
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
wheel==0.36.2 wheel==0.36.2
# via # via
@@ -24,5 +24,5 @@ wheel==0.36.2
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==20.3.3 pip==20.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
setuptools==51.1.1 setuptools==51.3.3
# via -r cibuildwheel/resources/constraints.in # via -r cibuildwheel/resources/constraints.in
@@ -1,22 +1,22 @@
[x86_64] [x86_64]
manylinux1 = quay.io/pypa/manylinux1_x86_64:2020-12-31-84e1e23 manylinux1 = quay.io/pypa/manylinux1_x86_64:2021-01-11-28ab838
manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2020-12-31-4928808 manylinux2010 = quay.io/pypa/manylinux2010_x86_64:2021-01-12-ff3830d
manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2020-12-31-56195b3 manylinux2014 = quay.io/pypa/manylinux2014_x86_64:2021-01-12-c8250d8
[i686] [i686]
manylinux1 = quay.io/pypa/manylinux1_i686:2020-12-31-84e1e23 manylinux1 = quay.io/pypa/manylinux1_i686:2021-01-11-28ab838
manylinux2010 = quay.io/pypa/manylinux2010_i686:2020-12-31-4928808 manylinux2010 = quay.io/pypa/manylinux2010_i686:2021-01-12-ff3830d
manylinux2014 = quay.io/pypa/manylinux2014_i686:2020-12-31-56195b3 manylinux2014 = quay.io/pypa/manylinux2014_i686:2021-01-12-c8250d8
[pypy_x86_64] [pypy_x86_64]
manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-12-11-f1e0e80 manylinux2010 = pypywheels/manylinux2010-pypy_x86_64:2020-12-11-f1e0e80
[aarch64] [aarch64]
manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2020-12-31-56195b3 manylinux2014 = quay.io/pypa/manylinux2014_aarch64:2021-01-12-c8250d8
[ppc64le] [ppc64le]
manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2020-12-31-56195b3 manylinux2014 = quay.io/pypa/manylinux2014_ppc64le:2021-01-12-c8250d8
[s390x] [s390x]
manylinux2014 = quay.io/pypa/manylinux2014_s390x:2020-12-31-56195b3 manylinux2014 = quay.io/pypa/manylinux2014_s390x:2021-01-12-c8250d8
+19 -1
View File
@@ -1,6 +1,16 @@
import os import os
import subprocess import subprocess
from typing import TYPE_CHECKING, Union import sys
from typing import TYPE_CHECKING, NoReturn, Set, Union
if sys.version_info < (3, 8):
from typing_extensions import Final, Literal, TypedDict
else:
from typing import Final, Literal, TypedDict
__all__ = ("Final", "Literal", "TypedDict", "Set", "Union", "PopenBytes", "PathOrStr", "PlatformName", "PLATFORMS", "assert_never")
if TYPE_CHECKING: if TYPE_CHECKING:
PopenBytes = subprocess.Popen[bytes] PopenBytes = subprocess.Popen[bytes]
@@ -8,3 +18,11 @@ if TYPE_CHECKING:
else: else:
PopenBytes = subprocess.Popen PopenBytes = subprocess.Popen
PathOrStr = Union[str, "os.PathLike[str]"] PathOrStr = Union[str, "os.PathLike[str]"]
PlatformName = Literal["linux", "macos", "windows"]
PLATFORMS: Final[Set[PlatformName]] = {"linux", "macos", "windows"}
def assert_never(value: NoReturn) -> NoReturn:
assert False, f'Unhandled value: {value} ({type(value).__name__})' # noqa: B011
+41 -105
View File
@@ -1,26 +1,26 @@
import functools import fnmatch
import itertools
import os import os
import platform as platform_module
import re import re
import ssl import ssl
import sys
import textwrap import textwrap
import urllib.request import urllib.request
from enum import Enum from enum import Enum
from fnmatch import fnmatch
from pathlib import Path from pathlib import Path
from time import sleep from time import sleep
from typing import Dict, List, NamedTuple, Optional, Set from typing import Dict, List, NamedTuple, Optional, Set
import bracex
import certifi import certifi
import toml
from .architecture import Architecture
from .environment import ParsedEnvironment from .environment import ParsedEnvironment
from .typing import PathOrStr from .typing import PathOrStr, PlatformName
if sys.version_info < (3, 8): resources_dir = Path(__file__).parent / 'resources'
from typing_extensions import Literal get_pip_script = resources_dir / 'get-pip.py'
else: install_certifi_script = resources_dir / "install_certifi.py"
from typing import Literal
def prepare_command(command: str, **kwargs: PathOrStr) -> str: def prepare_command(command: str, **kwargs: PathOrStr) -> str:
@@ -42,21 +42,45 @@ def get_build_verbosity_extra_flags(level: int) -> List[str]:
return [] return []
class BuildSelector: def read_python_configs(config: PlatformName) -> List[Dict[str, str]]:
def __init__(self, build_config: str, skip_config: str): input_file = resources_dir / 'build-platforms.toml'
loaded_file = toml.load(input_file)
results: List[Dict[str, str]] = list(loaded_file[config]['python_configurations'])
return results
class IdentifierSelector:
"""
This class holds a set of build/skip patterns. You call an instance with a
build identifier, and it returns True if that identifier should be
included.
"""
def __init__(self, *, build_config: str, skip_config: str):
self.build_patterns = build_config.split() self.build_patterns = build_config.split()
self.skip_patterns = skip_config.split() self.skip_patterns = skip_config.split()
def __call__(self, build_id: str) -> bool: def __call__(self, build_id: str) -> bool:
def match_any(patterns: List[str]) -> bool: build_patterns = itertools.chain.from_iterable(bracex.expand(p) for p in self.build_patterns)
return any(fnmatch(build_id, pattern) for pattern in patterns) skip_patterns = itertools.chain.from_iterable(bracex.expand(p) for p in self.skip_patterns)
return match_any(self.build_patterns) and not match_any(self.skip_patterns)
build: bool = any(fnmatch.fnmatch(build_id, pat) for pat in build_patterns)
skip: bool = any(fnmatch.fnmatch(build_id, pat) for pat in skip_patterns)
return build and not skip
def __repr__(self) -> str: def __repr__(self) -> str:
if not self.skip_patterns: if not self.skip_patterns:
return f'BuildSelector({" ".join(self.build_patterns)!r})' return f'{self.__class__.__name__}({" ".join(self.build_patterns)!r})'
else: else:
return f'BuildSelector({" ".join(self.build_patterns)!r} - {" ".join(self.skip_patterns)!r})' return f'{self.__class__.__name__}({" ".join(self.build_patterns)!r} - {" ".join(self.skip_patterns)!r})'
class BuildSelector(IdentifierSelector):
pass
class TestSelector(IdentifierSelector):
def __init__(self, *, skip_config: str):
super().__init__(build_config="*", skip_config=skip_config)
# Taken from https://stackoverflow.com/a/107717 # Taken from https://stackoverflow.com/a/107717
@@ -131,60 +155,6 @@ class DependencyConstraints:
return f'{self.__class__.__name__}{self.base_file_path!r})' return f'{self.__class__.__name__}{self.base_file_path!r})'
@functools.total_ordering
class Architecture(Enum):
value: str
# mac/linux archs
x86_64 = 'x86_64'
# linux archs
i686 = 'i686'
aarch64 = 'aarch64'
ppc64le = 'ppc64le'
s390x = 's390x'
# mac archs
universal2 = 'universal2'
arm64 = 'arm64'
# windows archs
x86 = 'x86'
AMD64 = 'AMD64'
# Allow this to be sorted
def __lt__(self, other: "Architecture") -> bool:
return self.value < other.value
@staticmethod
def parse_config(config: str, platform: str) -> 'Set[Architecture]':
result = set()
for arch_str in re.split(r'[\s,]+', config):
if arch_str == 'auto':
result |= Architecture.auto_archs(platform=platform)
else:
result.add(Architecture(arch_str))
return result
@staticmethod
def auto_archs(platform: str) -> 'Set[Architecture]':
native_architecture = Architecture(platform_module.machine())
result = {native_architecture}
if platform == 'linux' and native_architecture == Architecture.x86_64:
# x86_64 machines can run i686 docker containers
result.add(Architecture.i686)
if platform == 'windows' and native_architecture == Architecture.AMD64:
result.add(Architecture.x86)
if platform == 'macos' and native_architecture == Architecture.arm64:
# arm64 can build and test both archs of a universal2 wheel.
result.add(Architecture.universal2)
return result
class BuildOptions(NamedTuple): class BuildOptions(NamedTuple):
package_dir: Path package_dir: Path
output_dir: Path output_dir: Path
@@ -197,17 +167,13 @@ class BuildOptions(NamedTuple):
manylinux_images: Optional[Dict[str, str]] manylinux_images: Optional[Dict[str, str]]
dependency_constraints: Optional[DependencyConstraints] dependency_constraints: Optional[DependencyConstraints]
test_command: Optional[str] test_command: Optional[str]
test_selector: TestSelector
before_test: Optional[str] before_test: Optional[str]
test_requires: List[str] test_requires: List[str]
test_extras: str test_extras: str
build_verbosity: int build_verbosity: int
resources_dir = Path(__file__).resolve().parent / 'resources'
get_pip_script = resources_dir / 'get-pip.py'
install_certifi_script = resources_dir / "install_certifi.py"
class NonPlatformWheelError(Exception): class NonPlatformWheelError(Exception):
def __init__(self) -> None: def __init__(self) -> None:
message = textwrap.dedent(''' message = textwrap.dedent('''
@@ -258,36 +224,6 @@ def detect_ci_provider() -> Optional[CIProvider]:
return None return None
PRETTY_NAMES = {'linux': 'Linux', 'macos': 'macOS', 'windows': 'Windows'}
ALLOWED_ARCHITECTURES = {
'linux': {Architecture.x86_64, Architecture.i686, Architecture.aarch64, Architecture.ppc64le, Architecture.s390x},
'macos': {Architecture.x86_64, Architecture.universal2, Architecture.arm64},
'windows': {Architecture.AMD64, Architecture.x86},
}
def allowed_architectures_check(
name: Literal['linux', 'macos', 'windows'],
options: BuildOptions,
) -> None:
allowed_architectures = ALLOWED_ARCHITECTURES[name]
msg = f'{PRETTY_NAMES[name]} only supports {sorted(allowed_architectures)} at the moment.'
if name != 'linux':
msg += ' If you want to set emulation architectures on Linux, use CIBW_ARCHS_LINUX instead.'
if not options.architectures <= allowed_architectures:
msg = f'Invalid archs option {options.architectures}. ' + msg
raise ValueError(msg)
if not options.architectures:
msg = 'Empty archs option set. ' + msg
raise ValueError(msg)
def unwrap(text: str) -> str: def unwrap(text: str) -> str:
''' '''
Unwraps multi-line text to a single line Unwraps multi-line text to a single line
+19 -32
View File
@@ -9,19 +9,19 @@ from zipfile import ZipFile
import toml import toml
from .architecture import Architecture
from .environment import ParsedEnvironment from .environment import ParsedEnvironment
from .logger import log from .logger import log
from .typing import PathOrStr from .typing import PathOrStr
from .util import ( from .util import (
Architecture,
BuildOptions, BuildOptions,
BuildSelector, BuildSelector,
NonPlatformWheelError, NonPlatformWheelError,
allowed_architectures_check,
download, download,
get_build_verbosity_extra_flags, get_build_verbosity_extra_flags,
get_pip_script, get_pip_script,
prepare_command, prepare_command,
read_python_configs,
) )
IS_RUNNING_ON_AZURE = Path('C:\\hostedtoolcache').exists() IS_RUNNING_ON_AZURE = Path('C:\\hostedtoolcache').exists()
@@ -52,36 +52,25 @@ class PythonConfiguration(NamedTuple):
version: str version: str
arch: str arch: str
identifier: str identifier: str
url: Optional[str] url: Optional[str] = None
def get_python_configurations(build_selector: BuildSelector, architectures: Set[Architecture]) -> List[PythonConfiguration]: def get_python_configurations(
build_selector: BuildSelector,
architectures: Set[Architecture],
) -> List[PythonConfiguration]:
full_python_configs = read_python_configs('windows')
python_configurations = [PythonConfiguration(**item) for item in full_python_configs]
map_arch = { map_arch = {
'32': Architecture.x86, '32': Architecture.x86,
'64': Architecture.AMD64, '64': Architecture.AMD64,
} }
python_configurations = [ custom_compiler = os.environ.get('DISTUTILS_USE_SDK') and os.environ.get('MSSdk')
# CPython if IS_RUNNING_ON_TRAVIS and not custom_compiler:
PythonConfiguration(version='2.7.18', arch='32', identifier='cp27-win32', url=None),
PythonConfiguration(version='2.7.18', arch='64', identifier='cp27-win_amd64', url=None),
PythonConfiguration(version='3.5.4', arch='32', identifier='cp35-win32', url=None),
PythonConfiguration(version='3.5.4', arch='64', identifier='cp35-win_amd64', url=None),
PythonConfiguration(version='3.6.8', arch='32', identifier='cp36-win32', url=None),
PythonConfiguration(version='3.6.8', arch='64', identifier='cp36-win_amd64', url=None),
PythonConfiguration(version='3.7.9', arch='32', identifier='cp37-win32', url=None),
PythonConfiguration(version='3.7.9', arch='64', identifier='cp37-win_amd64', url=None),
PythonConfiguration(version='3.8.7', arch='32', identifier='cp38-win32', url=None),
PythonConfiguration(version='3.8.7', arch='64', identifier='cp38-win_amd64', url=None),
PythonConfiguration(version='3.9.1', arch='32', identifier='cp39-win32', url=None),
PythonConfiguration(version='3.9.1', arch='64', identifier='cp39-win_amd64', url=None),
# PyPy
PythonConfiguration(version='2.7', arch='32', identifier='pp27-win32', url='https://downloads.python.org/pypy/pypy2.7-v7.3.3-win32.zip'),
PythonConfiguration(version='3.6', arch='32', identifier='pp36-win32', url='https://downloads.python.org/pypy/pypy3.6-v7.3.3-win32.zip'),
PythonConfiguration(version='3.7', arch='32', identifier='pp37-win32', url='https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip'),
]
if IS_RUNNING_ON_TRAVIS:
# cannot install VCForPython27.msi which is needed for compiling C software # cannot install VCForPython27.msi which is needed for compiling C software
# try with (and similar): msiexec /i VCForPython27.msi ALLUSERS=1 ACCEPT=YES /passive # try with (and similar): msiexec /i VCForPython27.msi ALLUSERS=1 ACCEPT=YES /passive
python_configurations = [c for c in python_configurations if not c.version.startswith('2.7')] python_configurations = [c for c in python_configurations if not c.version.startswith('2.7')]
@@ -164,7 +153,7 @@ def setup_python(python_configuration: PythonConfiguration, dependency_constrain
where_python = subprocess.check_output(['where', 'python'], env=env, universal_newlines=True).splitlines()[0].strip() where_python = subprocess.check_output(['where', 'python'], env=env, universal_newlines=True).splitlines()[0].strip()
if where_python != str(installation_path / 'python.exe'): if where_python != str(installation_path / 'python.exe'):
print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr) print("cibuildwheel: python available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert python above it.", file=sys.stderr)
exit(1) sys.exit(1)
# make sure pip is installed # make sure pip is installed
if not (installation_path / 'Scripts' / 'pip.exe').exists(): if not (installation_path / 'Scripts' / 'pip.exe').exists():
@@ -173,7 +162,7 @@ def setup_python(python_configuration: PythonConfiguration, dependency_constrain
where_pip = subprocess.check_output(['where', 'pip'], env=env, universal_newlines=True).splitlines()[0].strip() where_pip = subprocess.check_output(['where', 'pip'], env=env, universal_newlines=True).splitlines()[0].strip()
if where_pip.strip() != str(installation_path / 'Scripts' / 'pip.exe'): if where_pip.strip() != str(installation_path / 'Scripts' / 'pip.exe'):
print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr) print("cibuildwheel: pip available on PATH doesn't match our installed instance. If you have modified PATH, ensure that you don't overwrite cibuildwheel's entry or insert pip above it.", file=sys.stderr)
exit(1) sys.exit(1)
log.step('Installing build tools...') log.step('Installing build tools...')
@@ -210,15 +199,13 @@ def pep_518_cp35_workaround(package_dir: Path, env: Dict[str, str]) -> None:
log.step('Performing PEP518 workaround...') log.step('Performing PEP518 workaround...')
with tempfile.TemporaryDirectory() as d: with tempfile.TemporaryDirectory() as d:
reqfile = Path(d) / "requirements.txt" reqfile = Path(d) / "requirements.txt"
with reqfile.open("w") as f: with reqfile.open('w') as f:
for r in requirements: for r in requirements:
print(r, file=f) print(r, file=f)
call(['pip', 'install', '-r', reqfile], env=env) call(['pip', 'install', '-r', reqfile], env=env)
def build(options: BuildOptions) -> None: def build(options: BuildOptions) -> None:
allowed_architectures_check("windows", options)
temp_dir = Path(tempfile.mkdtemp(prefix='cibuildwheel')) temp_dir = Path(tempfile.mkdtemp(prefix='cibuildwheel'))
built_wheel_dir = temp_dir / 'built_wheel' built_wheel_dir = temp_dir / 'built_wheel'
repaired_wheel_dir = temp_dir / 'repaired_wheel' repaired_wheel_dir = temp_dir / 'repaired_wheel'
@@ -288,7 +275,7 @@ def build(options: BuildOptions) -> None:
repaired_wheel = next(repaired_wheel_dir.glob('*.whl')) repaired_wheel = next(repaired_wheel_dir.glob('*.whl'))
if options.test_command: if options.test_command and options.test_selector(config.identifier):
log.step('Testing wheel...') log.step('Testing wheel...')
# set up a virtual environment to install and test from, to make sure # set up a virtual environment to install and test from, to make sure
# there are no dependencies that were pulled in at build time. # there are no dependencies that were pulled in at build time.
@@ -341,4 +328,4 @@ def build(options: BuildOptions) -> None:
log.build_end() log.build_end()
except subprocess.CalledProcessError as error: except subprocess.CalledProcessError as error:
log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}') log.step_end_with_error(f'Command {error.cmd} failed with code {error.returncode}. {error.stdout}')
exit(1) sys.exit(1)
+58
View File
@@ -229,3 +229,61 @@
ci: [travisci] ci: [travisci]
os: [windows, apple, linux] os: [windows, apple, linux]
notes: Dependency injection framework for Python, uses Windows TravisCI notes: Dependency injection framework for Python, uses Windows TravisCI
- name: numexpr
gh: pydata/numexpr
ci: [github, travisci]
os: [windows, apple, linux]
- name: PyTables
gh: PyTables/PyTables
ci: [github]
os: [windows, apple, linux]
- name: dd-trace-py
gh: DataDog/dd-trace-py
ci: [github]
os: [windows, apple, linux]
notes: Uses custom alternate arch emulation on GitHub
- name: Tokenizer
gh: OpenNMT/Tokenizer
ci: [github, travisci]
os: [apple, linux]
- name: matrixprofile
gh: matrix-profile-foundation/matrixprofile
ci: [travisci]
os: [windows, apple, linux]
- name: cyvcf2
gh: brentp/cyvcf2
ci: [github]
os: [apple, linux]
- name: CTranslate2
gh: OpenNMT/CTranslate2
ci: [github]
os: [apple, linux]
notes: Includes libraries from the [Intel oneAPI toolkit](https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html). The Linux wheels also include CUDA libraries for GPU execution.
- name: MyPy
gh: mypyc/mypy_mypyc-wheels
stars: python/mypy
ci: [github]
os: [apple, linux, windows]
notes: MyPyC, the compiled component of MyPy.
- name: Imagecodecs (fork)
gh: czaki/imagecodecs_build
stars: cgohlke/imagecodecs
ci: [azurepipelines]
ci_config: azure-pipelines.yaml
os: [apple, linux]
notes: Over 20 external dependencies in compiled libraries, custom docker image, `libomp`, `openblas` and `install_name_tool` for macOS.
- name: ruptures
gh: deepcharles/ruptures
ci: [github]
os: [apple, linux, windows]
notes: Extensive Cython + NumPy [pyproject.toml](https://github.com/deepcharles/ruptures/blob/master/pyproject.toml) example.
+3 -3
View File
@@ -113,10 +113,10 @@ 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: If you use GitHub Actions for builds, you can use cibuildwheel as an action:
```yaml ```yaml
uses: joerick/cibuildwheel@v1.7.4 uses: joerick/cibuildwheel@v1.8.0
``` ```
This is a composite step that just installs and runs cibuildwheel. You can set command-line options as `with:` parameters, and use `env:` as normal. 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.
Then, your `dependabot.yml` file could look like this: Then, your `dependabot.yml` file could look like this:
@@ -139,7 +139,7 @@ The second option, and the only one that supports other CI systems, is using a `
```bash ```bash
# requirements-cibw.txt # requirements-cibw.txt
cibuildwheel==1.7.4 cibuildwheel==1.8.0
``` ```
Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `dependabot.yml` file could look like this: Then your install step would have `python -m pip install -r requirements-cibw.txt` in it. Your `dependabot.yml` file could look like this:
+62 -18
View File
@@ -75,7 +75,7 @@ Space-separated list of builds to build and skip. Each build has an identifier l
When both options are specified, both conditions are applied and only builds with a tag that matches `CIBW_BUILD` and does not match `CIBW_SKIP` will be built. When both options are specified, both conditions are applied and only builds with a tag that matches `CIBW_BUILD` and does not match `CIBW_SKIP` will be built.
When setting the options, you can use shell-style globbing syntax (as per [`fnmatch`](https://docs.python.org/3/library/fnmatch.html)). All the build identifiers supported by cibuildwheel are shown below: When setting the options, you can use shell-style globbing syntax, as per [`fnmatch`](https://docs.python.org/3/library/fnmatch.html) with the addition of curly bracket syntax `{option1,option2}`, provided by [`bracex`](https://pypi.org/project/bracex/). All the build identifiers supported by cibuildwheel are shown below:
<div class="build-id-table-marker"></div> <div class="build-id-table-marker"></div>
@@ -124,12 +124,12 @@ CIBW_SKIP: cp27-* cp35-*
# Skip Python 3.6 on Linux # Skip Python 3.6 on Linux
CIBW_SKIP: cp36-manylinux* CIBW_SKIP: cp36-manylinux*
# Only build on Python 3 and skip 32-bit builds # Only build on Python 3 (ready for 3.10 when it comes) and skip 32-bit builds
CIBW_BUILD: cp3?-* CIBW_BUILD: {cp,pp}3*-*
CIBW_SKIP: "*-win32 *-manylinux_i686" CIBW_SKIP: "*-win32 *-manylinux_i686"
# Only build PyPy and CPython 3 # Only build PyPy and CPython 3
CIBW_BUILD: pp* cp3?-* CIBW_BUILD: pp* cp3*-*
# Disable building PyPy wheels on all platforms # Disable building PyPy wheels on all platforms
CIBW_SKIP: pp* CIBW_SKIP: pp*
@@ -163,11 +163,17 @@ emulation, such as that provided by [docker/setup-qemu-action][setup-qemu-action
or [tonistiigi/binfmt][binfmt], to build architectures other than those your or [tonistiigi/binfmt][binfmt], to build architectures other than those your
machine natively supports. machine natively supports.
Options: `auto` `x86_64` `i686` `aarch64` `ppc64le` `s390x` Options: `auto` `native` `all` `x86_64` `i686` `aarch64` `ppc64le` `s390x`
Default: `auto`, meaning the native archs supported on the build machine. For Default: `auto`, meaning the native archs supported on the build machine. For
example, on an `x86_64` machine, `auto` expands to `x86_64` and `i686`. example, on an `x86_64` machine, `auto` expands to `x86_64` and `i686`.
`native` will only build on the exact architecture you currently are on; it will
not add `i686` for `x86_64`.
`all` will expand to all known architectures; remember to use build selectors
to limit builds for each job; this list could grow in the future.
[setup-qemu-action]: https://github.com/docker/setup-qemu-action [setup-qemu-action]: https://github.com/docker/setup-qemu-action
[binfmt]: https://hub.docker.com/r/tonistiigi/binfmt [binfmt]: https://hub.docker.com/r/tonistiigi/binfmt
@@ -243,7 +249,7 @@ CIBW_BEFORE_ALL_LINUX: yum install -y libffi-dev
A shell command to run before building the wheel. This option allows you to run a command in **each** Python environment before the `pip wheel` command. This is useful if you need to set up some dependency so it's available during the build. A shell command to run before building the wheel. This option allows you to run a command in **each** Python environment before the `pip wheel` command. This is useful if you need to set up some dependency so it's available during the build.
If dependencies are required to build your wheel (for example if you include a header from a Python module), set this to `pip install .`, and the dependencies will be installed automatically by pip. However, this means your package will be built twice - if your package takes a long time to build, you might wish to manually list the dependencies here instead. If dependencies are required to build your wheel (for example if you include a header from a Python module), instead of using this command, we recommend adding requirements to a pyproject.toml file. This is reproducible, and users who do not get your wheels (such as Alpine or ClearLinux users) will still benefit.
The active Python binary can be accessed using `python`, and pip with `pip`; `cibuildwheel` makes sure the right version of Python and pip will be executed. The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by `cibuildwheel`. The active Python binary can be accessed using `python`, and pip with `pip`; `cibuildwheel` makes sure the right version of Python and pip will be executed. The placeholder `{package}` can be used here; it will be replaced by the path to the package being built by `cibuildwheel`.
@@ -254,22 +260,45 @@ Platform-specific variants also available:<br/>
#### Examples #### Examples
```yaml ```yaml
# install your project and dependencies before building # install something required for the build (you might want to use pyproject.toml instead)
CIBW_BEFORE_BUILD: pip install .
# install something required for the build
CIBW_BEFORE_BUILD: pip install pybind11 CIBW_BEFORE_BUILD: pip install pybind11
# chain commands using && # chain commands using &&
CIBW_BEFORE_BUILD: yum install -y libffi-dev && pip install . CIBW_BEFORE_BUILD_LINUX: yum install -y libffi-dev && make clean
# run a script that's inside your project # run a script that's inside your project
CIBW_BEFORE_BUILD: bash scripts/prepare_for_build.sh CIBW_BEFORE_BUILD: bash scripts/prepare_for_build.sh
# if cibuildwheel is called with a package_dir argument, it's available as {package} # if cibuildwheel is called with a package_dir argument, it's available as {package}
CIBW_BEFORE_BUILD: "{package}/bin/prepare_for_build.sh" CIBW_BEFORE_BUILD: "{package}/script/prepare_for_build.sh"
``` ```
!!! note
If you need dependencies installed for the build, we recommend using pyproject.toml. This is an example pyproject.toml file:
[build-system]
requires = [
"setuptools>=42",
"wheel",
"Cython",
"numpy==1.11.3; python_version<='3.6'",
"numpy==1.14.5; python_version=='3.7'",
"numpy==1.17.3; python_version=='3.8'",
"numpy==1.19.4; python_version>='3.9'",
]
build-backend = "setuptools.build_meta"
This [PEP 517][]/[PEP 518][] style build allows you to completely control the
build environment in cibuildwheel, [PyPA-build][], and pip, doesn't force
downstream users to install anything they don't need, and lets you do more
complex pinning (Cython, for example, requires a wheel to be built with an
equal or earlier version of NumPy; pinning in this way is the only way to
ensure your module works on all available NumPy versions).
[PyPA-build]: https://pypa-build.readthedocs.io/en/latest/
[PEP 517]: https://www.python.org/dev/peps/pep-0517/
[PEP 518]: https://www.python.org/dev/peps/pep-0517/
### `CIBW_REPAIR_WHEEL_COMMAND` {: #repair-wheel-command} ### `CIBW_REPAIR_WHEEL_COMMAND` {: #repair-wheel-command}
> Execute a shell command to repair each (non-pure Python) built wheel > Execute a shell command to repair each (non-pure Python) built wheel
@@ -488,6 +517,18 @@ Platform-specific variants also available:<br/>
CIBW_TEST_EXTRAS: test,qt CIBW_TEST_EXTRAS: test,qt
``` ```
### `CIBW_TEST_SKIP` {: #test-skip}
> Skip running tests on some builds
This will skip testing on any identifiers that match the given skip patterns (see [`CIBW_SKIP`](#build-skip)). This can be used to mask out tests for wheels that have missing dependencies upstream that are slow or hard to build, or to mask up slow tests on emulated architectures.
#### Examples
```yaml
# Will avoid testing on emulated architectures
CIBW_TEST_SKIP: "*-manylinux_{aarch64,ppc64le,s390x}"
```
## Other ## Other
@@ -512,7 +553,7 @@ CIBW_BUILD_VERBOSITY: 1
```text ```text
usage: cibuildwheel [-h] [--platform {auto,linux,macos,windows}] usage: cibuildwheel [-h] [--platform {auto,linux,macos,windows}]
[--archs ARCHS] [--output-dir OUTPUT_DIR] [--archs ARCHS] [--output-dir OUTPUT_DIR]
[--print-build-identifiers] [--print-build-identifiers] [--allow-empty]
[package_dir] [package_dir]
Build wheels for all the platforms. Build wheels for all the platforms.
@@ -535,16 +576,19 @@ optional arguments:
you need to run in Windows, and it will build and test you need to run in Windows, and it will build and test
for all versions of Python. Default: auto. for all versions of Python. Default: auto.
--archs ARCHS Comma-separated list of CPU architectures to build --archs ARCHS Comma-separated list of CPU architectures to build
for. If unspecified, builds the architectures natively for. When set to 'auto', builds the architectures
supported on this machine. Set this option to build an natively supported on this machine. Set this option to
architecture via emulation, for example, using build an architecture via emulation, for example,
binfmt_misc and qemu. Default: auto Choices: auto, using binfmt_misc and QEMU. Default: auto. Choices:
x86_64, i686, aarch64, ppc64le, s390x, x86, AMD64 auto, native, all, x86_64, i686, aarch64, ppc64le,
s390x, x86, AMD64
--output-dir OUTPUT_DIR --output-dir OUTPUT_DIR
Destination folder for the wheels. Destination folder for the wheels.
--print-build-identifiers --print-build-identifiers
Print the build identifiers matched by the current Print the build identifiers matched by the current
invocation and exit. invocation and exit.
--allow-empty Do not report an error code if the build does not
match any wheels.
``` ```
<style> <style>
+2 -2
View File
@@ -17,7 +17,7 @@ For more info on this file, check out the [docs](https://help.github.com/en/acti
[`examples/github-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI. [`examples/github-deploy.yml`](https://github.com/joerick/cibuildwheel/blob/master/examples/github-deploy.yml) extends this minimal example with a demonstration of how to automatically upload the built wheels to PyPI.
You can also use cibuildwheel directly as an action with `uses: joerick/cibuildwheel@v1.7.4`; this combines the download and run steps into a single action, and command line arguments are available via `with:`. This makes it easy to manage cibuildwheel updates via normal actions update mechanisms like dependabot, see [Automatic updates](faq.md#automatic-updates). You can also use cibuildwheel directly as an action with `uses: joerick/cibuildwheel@v1.8.0`; this combines the download and run steps into a single action, and command line arguments are available via `with:`. This makes it easy to manage cibuildwheel updates via normal actions update mechanisms like dependabot, see [Automatic updates](faq.md#automatic-updates).
# Azure Pipelines [linux/mac/windows] {: #azure-pipelines} # Azure Pipelines [linux/mac/windows] {: #azure-pipelines}
@@ -44,7 +44,7 @@ To build Linux, Mac, and Windows wheels on Travis CI, create a `.travis.yml` fil
{% include "../examples/travis-ci-minimal.yml" %} {% include "../examples/travis-ci-minimal.yml" %}
``` ```
Note that building Windows Python 2.7 wheels on Travis is unsupported. Note that building Windows Python 2.7 wheels on Travis is unsupported unless using a newer compiler [via a workaround](cpp_standards.md).
Commit this file, enable building of your repo on Travis CI, and push. Commit this file, enable building of your repo on Travis CI, and push.
+1 -1
View File
@@ -12,7 +12,7 @@ stack: python 3.7
init: init:
- cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH%
install: python -m pip install cibuildwheel==1.7.4 install: python -m pip install cibuildwheel==1.8.0
build_script: python -m cibuildwheel --output-dir wheelhouse build_script: python -m cibuildwheel --output-dir wheelhouse
+3 -3
View File
@@ -6,7 +6,7 @@ jobs:
- bash: | - bash: |
set -o errexit set -o errexit
python3 -m pip install --upgrade pip python3 -m pip install --upgrade pip
pip3 install cibuildwheel==1.7.4 pip3 install cibuildwheel==1.8.0
displayName: Install dependencies displayName: Install dependencies
- bash: cibuildwheel --output-dir wheelhouse . - bash: cibuildwheel --output-dir wheelhouse .
displayName: Build wheels displayName: Build wheels
@@ -20,7 +20,7 @@ jobs:
- bash: | - bash: |
set -o errexit set -o errexit
python3 -m pip install --upgrade pip python3 -m pip install --upgrade pip
python3 -m pip install cibuildwheel==1.7.4 python3 -m pip install cibuildwheel==1.8.0
displayName: Install dependencies displayName: Install dependencies
- bash: cibuildwheel --output-dir wheelhouse . - bash: cibuildwheel --output-dir wheelhouse .
displayName: Build wheels displayName: Build wheels
@@ -36,7 +36,7 @@ jobs:
- bash: | - bash: |
set -o errexit set -o errexit
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install cibuildwheel==1.7.4 pip install cibuildwheel==1.8.0
displayName: Install dependencies displayName: Install dependencies
- bash: cibuildwheel --output-dir wheelhouse . - bash: cibuildwheel --output-dir wheelhouse .
displayName: Build wheels displayName: Build wheels
+2 -2
View File
@@ -11,7 +11,7 @@ jobs:
- run: - run:
name: Build the Linux wheels. name: Build the Linux wheels.
command: | command: |
pip3 install --user cibuildwheel==1.7.4 pip3 install --user cibuildwheel==1.8.0
cibuildwheel --output-dir wheelhouse cibuildwheel --output-dir wheelhouse
- store_artifacts: - store_artifacts:
path: wheelhouse/ path: wheelhouse/
@@ -25,7 +25,7 @@ jobs:
- run: - run:
name: Build the OS X wheels. name: Build the OS X wheels.
command: | command: |
pip3 install cibuildwheel==1.7.4 pip3 install cibuildwheel==1.8.0
cibuildwheel --output-dir wheelhouse cibuildwheel --output-dir wheelhouse
- store_artifacts: - store_artifacts:
path: wheelhouse/ path: wheelhouse/
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
- name: Install cibuildwheel - name: Install cibuildwheel
run: | run: |
python -m pip install cibuildwheel==1.7.4 python -m pip install cibuildwheel==1.8.0
- name: Install Visual C++ for Python 2.7 - name: Install Visual C++ for Python 2.7
if: runner.os == 'Windows' if: runner.os == 'Windows'
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
- name: Install cibuildwheel - name: Install cibuildwheel
run: | run: |
python -m pip install cibuildwheel==1.7.4 python -m pip install cibuildwheel==1.8.0
- name: Install Visual C++ for Python 2.7 - name: Install Visual C++ for Python 2.7
if: runner.os == 'Windows' if: runner.os == 'Windows'
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
- name: Install cibuildwheel - name: Install cibuildwheel
run: | run: |
python -m pip install cibuildwheel==1.7.1 python -m pip install cibuildwheel==1.8.0
- name: Install Visual C++ for Python 2.7 - name: Install Visual C++ for Python 2.7
if: runner.os == 'Windows' if: runner.os == 'Windows'
+1 -1
View File
@@ -20,7 +20,7 @@ jobs:
- ln -s /c/Python38/python.exe /c/Python38/python3.exe - ln -s /c/Python38/python.exe /c/Python38/python3.exe
install: install:
- python3 -m pip install cibuildwheel==1.7.4 - python3 -m pip install cibuildwheel==1.8.0
script: script:
# build the wheels, put them into './wheelhouse' # build the wheels, put them into './wheelhouse'
+1 -1
View File
@@ -26,7 +26,7 @@ jobs:
- ln -s /c/Python38/python.exe /c/Python38/python3.exe - ln -s /c/Python38/python.exe /c/Python38/python3.exe
install: install:
- python3 -m pip install cibuildwheel==1.7.4 - python3 -m pip install cibuildwheel==1.8.0
script: script:
# build the wheels, put them into './wheelhouse' # build the wheels, put them into './wheelhouse'
+3 -3
View File
@@ -55,7 +55,7 @@ jobs:
- stage: deploy - stage: deploy
name: Build and deploy Linux wheels name: Build and deploy Linux wheels
services: docker services: docker
install: python3 -m pip install cibuildwheel==1.7.4 install: python3 -m pip install cibuildwheel==1.8.0
script: python3 -m cibuildwheel --output-dir wheelhouse script: python3 -m cibuildwheel --output-dir wheelhouse
after_success: | after_success: |
python3 -m pip install twine python3 -m pip install twine
@@ -65,7 +65,7 @@ jobs:
name: Build and deploy macOS wheels name: Build and deploy macOS wheels
os: osx os: osx
language: shell language: shell
install: python3 -m pip install cibuildwheel==1.7.4 install: python3 -m pip install cibuildwheel==1.8.0
script: python3 -m cibuildwheel --output-dir wheelhouse script: python3 -m cibuildwheel --output-dir wheelhouse
after_success: | after_success: |
python3 -m pip install twine python3 -m pip install twine
@@ -75,7 +75,7 @@ jobs:
name: Build and deploy Windows wheels name: Build and deploy Windows wheels
os: windows os: windows
language: shell language: shell
install: python3 -m pip install cibuildwheel==1.7.4 install: python3 -m pip install cibuildwheel==1.8.0
script: python3 -m cibuildwheel --output-dir wheelhouse script: python3 -m cibuildwheel --output-dir wheelhouse
after_success: | after_success: |
python3 -m pip install twine python3 -m pip install twine
+12 -2
View File
@@ -1,7 +1,7 @@
[metadata] [metadata]
name = cibuildwheel name = cibuildwheel
version = 1.7.4 version = 1.8.0
description = Build Python wheels on CI with minimal configuration. description = Build Python wheels on CI with minimal configuration.
long_description = file: README.md long_description = file: README.md
long_description_content_type = text/markdown long_description_content_type = text/markdown
@@ -31,6 +31,7 @@ install_requires =
bashlex!=0.13 bashlex!=0.13
toml toml
certifi certifi
bracex
typing_extensions; python_version < '3.8' typing_extensions; python_version < '3.8'
[options.package_data] [options.package_data]
@@ -50,6 +51,8 @@ dev =
pyyaml pyyaml
requests requests
typing-extensions typing-extensions
packaging>=20.8
rich>=9.6
[options.packages.find] [options.packages.find]
include = include =
@@ -80,7 +83,7 @@ junit_family=xunit2
[mypy] [mypy]
python_version = 3.6 python_version = 3.6
files = cibuildwheel,test,unit_test files = cibuildwheel,test,unit_test,bin
warn_unused_configs = True warn_unused_configs = True
warn_redundant_casts = True warn_redundant_casts = True
@@ -112,6 +115,13 @@ ignore_missing_imports = True
[mypy-bashlex.*] [mypy-bashlex.*]
ignore_missing_imports = True ignore_missing_imports = True
# Has type stubs, but no pyproject.toml or .pyi files in the wheel.
[mypy-toml.*]
ignore_missing_imports = True
[mypy-bracex.*]
ignore_missing_imports = True
[tool:isort] [tool:isort]
profile=black profile=black
multi_line_output=3 multi_line_output=3
+1 -1
View File
@@ -202,7 +202,7 @@ def test_cpp17_py27_modern_msvc_workaround(tmp_path):
add_env_x64['CIBW_BUILD'] = 'cp27-win_amd64' add_env_x64['CIBW_BUILD'] = 'cp27-win_amd64'
actual_wheels += utils.cibuildwheel_run(project_dir, add_env=add_env_x64) actual_wheels += utils.cibuildwheel_run(project_dir, add_env=add_env_x64)
expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0') expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', exclude_27=False)
if 'cp27-cp27m-win' in w if 'cp27-cp27m-win' in w
or 'pp27-pypy_73-win32' in w] or 'pp27-pypy_73-win32' in w]
+6
View File
@@ -52,6 +52,9 @@ def test_pinned_versions(tmp_path, python_version):
if utils.platform == 'linux': if utils.platform == 'linux':
pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead') pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead')
if utils.IS_WINDOWS_RUNNING_ON_TRAVIS and python_version == '2.7':
pytest.skip('Windows + Travis CI requires a workaround')
project_dir = tmp_path / 'project' project_dir = tmp_path / 'project'
project_with_expected_version_checks.generate(project_dir) project_with_expected_version_checks.generate(project_dir)
@@ -114,6 +117,9 @@ def test_dependency_constraints_file(tmp_path, python_version):
if utils.platform == 'linux': if utils.platform == 'linux':
pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead') pytest.skip('linux doesn\'t pin individual tool versions, it pins manylinux images instead')
if utils.IS_WINDOWS_RUNNING_ON_TRAVIS and python_version == '2.7':
pytest.skip('Windows + Travis CI requires a workaround')
project_dir = tmp_path / 'project' project_dir = tmp_path / 'project'
project_with_expected_version_checks.generate(project_dir) project_with_expected_version_checks.generate(project_dir)
+5 -3
View File
@@ -87,7 +87,8 @@ def _get_arm64_macosx_deployment_target(macosx_deployment_target: str) -> str:
def expected_wheels(package_name, package_version, manylinux_versions=None, def expected_wheels(package_name, package_version, manylinux_versions=None,
macosx_deployment_target='10.9', machine_arch=None): macosx_deployment_target='10.9', machine_arch=None, *,
exclude_27=IS_WINDOWS_RUNNING_ON_TRAVIS):
''' '''
Returns a list of expected wheels from a run of cibuildwheel. Returns a list of expected wheels from a run of cibuildwheel.
''' '''
@@ -165,8 +166,9 @@ def expected_wheels(package_name, package_version, manylinux_versions=None,
for platform_tag in platform_tags: for platform_tag in platform_tags:
wheels.append(f'{package_name}-{package_version}-{python_abi_tag}-{platform_tag}.whl') wheels.append(f'{package_name}-{package_version}-{python_abi_tag}-{platform_tag}.whl')
if IS_WINDOWS_RUNNING_ON_TRAVIS: # Travis on Windows does not support using the default Python 2.7 compiler,
# Python 2.7 isn't supported on Travis. # so we support skipping here.
if exclude_27:
wheels = [w for w in wheels if '-cp27-' not in w and '-pp2' not in w] wheels = [w for w in wheels if '-cp27-' not in w and '-pp2' not in w]
return wheels return wheels
+43
View File
@@ -0,0 +1,43 @@
import pytest
import toml
from cibuildwheel.util import resources_dir
Version = pytest.importorskip("packaging.version").Version
from cibuildwheel.extra import InlineArrayDictEncoder # noqa: E402
def test_compare_configs():
with open(resources_dir / "build-platforms.toml") as f:
txt = f.read()
dict_txt = toml.loads(txt)
new_txt = toml.dumps(dict_txt, encoder=InlineArrayDictEncoder())
print(new_txt)
assert new_txt == txt
def test_dump_with_Version():
example = {
"windows": {
"python_configurations": [
{"identifier": "cp27-win32", "version": Version("2.7.18"), "arch": "32"},
{"identifier": "cp27-win_amd64", "version": Version("2.7.18"), "arch": "64"},
]
}
}
result = """\
[windows]
python_configurations = [
{ identifier = "cp27-win32", version = "2.7.18", arch = "32" },
{ identifier = "cp27-win_amd64", version = "2.7.18", arch = "64" },
]
"""
output = toml.dumps(example, encoder=InlineArrayDictEncoder())
print(output)
assert output == result
+10
View File
@@ -59,3 +59,13 @@ def test_build_and_skip():
assert not build_selector('cp27-win_amd64') assert not build_selector('cp27-win_amd64')
assert build_selector('cp36-win_amd64') assert build_selector('cp36-win_amd64')
assert not build_selector('cp37-win_amd64') assert not build_selector('cp37-win_amd64')
def test_build_braces():
build_selector = BuildSelector(build_config="cp{36,37}*", skip_config="")
assert not build_selector('cp27-manylinux1_x86_64')
assert build_selector('cp36-manylinux1_x86_64')
assert build_selector('cp37-manylinux1_x86_64')
assert not build_selector('cp38-manylinux1_x86_64')
assert not build_selector('cp39-manylinux1_x86_64')
+15 -1
View File
@@ -1,3 +1,4 @@
import platform as platform_module
import subprocess import subprocess
import sys import sys
from pathlib import Path from pathlib import Path
@@ -51,14 +52,27 @@ def fake_package_dir(monkeypatch):
else: else:
return real_path_exists(path) return real_path_exists(path)
args = ['cibuildwheel', str(MOCK_PACKAGE_DIR)]
monkeypatch.setattr(Path, 'exists', mock_path_exists) monkeypatch.setattr(Path, 'exists', mock_path_exists)
monkeypatch.setattr(sys, 'argv', ['cibuildwheel', str(MOCK_PACKAGE_DIR)]) monkeypatch.setattr(sys, 'argv', args)
return args
@pytest.fixture
def allow_empty(request, monkeypatch, fake_package_dir):
monkeypatch.setattr(sys, 'argv', fake_package_dir + ['--allow-empty'])
@pytest.fixture(params=['linux', 'macos', 'windows']) @pytest.fixture(params=['linux', 'macos', 'windows'])
def platform(request, monkeypatch): def platform(request, monkeypatch):
platform_value = request.param platform_value = request.param
monkeypatch.setenv('CIBW_PLATFORM', platform_value) monkeypatch.setenv('CIBW_PLATFORM', platform_value)
if platform_value == 'windows':
monkeypatch.setattr(platform_module, 'machine', lambda: 'AMD64')
else:
monkeypatch.setattr(platform_module, 'machine', lambda: 'x86_64')
return platform_value return platform_value
+11 -2
View File
@@ -40,7 +40,7 @@ def test_output_dir_argument(also_set_environment, platform, intercepted_build_a
assert intercepted_build_args.args[0].output_dir == OUTPUT_DIR assert intercepted_build_args.args[0].output_dir == OUTPUT_DIR
def test_build_selector(platform, intercepted_build_args, monkeypatch): def test_build_selector(platform, intercepted_build_args, monkeypatch, allow_empty):
BUILD = 'some build* *-selector' BUILD = 'some build* *-selector'
SKIP = 'some skip* *-selector' SKIP = 'some skip* *-selector'
@@ -57,6 +57,15 @@ def test_build_selector(platform, intercepted_build_args, monkeypatch):
# Unit tests for BuildSelector are in build_selector_test.py # Unit tests for BuildSelector are in build_selector_test.py
def test_empty_selector(platform, intercepted_build_args, monkeypatch):
monkeypatch.setenv('CIBW_SKIP', '*')
with pytest.raises(SystemExit) as e:
main()
assert e.value.code == 3
@pytest.mark.parametrize('architecture, image, full_image', [ @pytest.mark.parametrize('architecture, image, full_image', [
('x86_64', None, 'quay.io/pypa/manylinux2010_x86_64:*'), ('x86_64', None, 'quay.io/pypa/manylinux2010_x86_64:*'),
('x86_64', 'manylinux1', 'quay.io/pypa/manylinux1_x86_64:*'), ('x86_64', 'manylinux1', 'quay.io/pypa/manylinux1_x86_64:*'),
@@ -220,7 +229,7 @@ def test_build_verbosity(build_verbosity, platform_specific, platform, intercept
('*-macosx_10_9_x86_64', ['*-macosx_x86_64']), ('*-macosx_10_9_x86_64', ['*-macosx_x86_64']),
('cp37-macosx_10_9_x86_64', ['cp37-macosx_x86_64']), ('cp37-macosx_10_9_x86_64', ['cp37-macosx_x86_64']),
]) ])
def test_build_selector_migrations(intercepted_build_args, monkeypatch, option_name, option_value, build_selector_patterns): def test_build_selector_migrations(intercepted_build_args, monkeypatch, option_name, option_value, build_selector_patterns, allow_empty):
monkeypatch.setenv(option_name, option_value) monkeypatch.setenv(option_name, option_value)
main() main()
+37 -5
View File
@@ -1,4 +1,3 @@
import platform as platform_module
import sys import sys
import pytest import pytest
@@ -68,34 +67,39 @@ def test_platform_environment(platform, intercepted_build_args, monkeypatch):
def test_archs_default(platform, intercepted_build_args, monkeypatch): def test_archs_default(platform, intercepted_build_args, monkeypatch):
monkeypatch.setattr(platform_module, 'machine', lambda: 'x86_64')
main() main()
build_options = intercepted_build_args.args[0] build_options = intercepted_build_args.args[0]
if platform == 'linux': if platform == 'linux':
assert build_options.architectures == {Architecture.x86_64, Architecture.i686} assert build_options.architectures == {Architecture.x86_64, Architecture.i686}
elif platform == 'windows':
assert build_options.architectures == {Architecture.AMD64, Architecture.x86}
else: else:
assert build_options.architectures == {Architecture.x86_64} assert build_options.architectures == {Architecture.x86_64}
@pytest.mark.parametrize('use_env_var', [False, True]) @pytest.mark.parametrize('use_env_var', [False, True])
def test_archs_argument(platform, intercepted_build_args, monkeypatch, use_env_var): def test_archs_argument(platform, intercepted_build_args, monkeypatch, use_env_var):
monkeypatch.setattr(platform_module, 'machine', lambda: 'x86_64')
if use_env_var: if use_env_var:
monkeypatch.setenv('CIBW_ARCHS', 'ppc64le') monkeypatch.setenv('CIBW_ARCHS', 'ppc64le')
else: else:
monkeypatch.setenv('CIBW_ARCHS', 'unused') monkeypatch.setenv('CIBW_ARCHS', 'unused')
monkeypatch.setattr(sys, 'argv', sys.argv + ['--archs', 'ppc64le']) monkeypatch.setattr(sys, 'argv', sys.argv + ['--archs', 'ppc64le'])
if platform in {'macos', 'windows'}:
with pytest.raises(SystemExit) as exit:
main()
assert exit.value.args == (4,)
else:
main() main()
build_options = intercepted_build_args.args[0] build_options = intercepted_build_args.args[0]
assert build_options.architectures == {Architecture.ppc64le} assert build_options.architectures == {Architecture.ppc64le}
def test_archs_platform_specific(platform, intercepted_build_args, monkeypatch): def test_archs_platform_specific(platform, intercepted_build_args, monkeypatch):
monkeypatch.setattr(platform_module, 'machine', lambda: 'x86_64')
monkeypatch.setenv('CIBW_ARCHS', 'unused') monkeypatch.setenv('CIBW_ARCHS', 'unused')
monkeypatch.setenv('CIBW_ARCHS_LINUX', 'ppc64le') monkeypatch.setenv('CIBW_ARCHS_LINUX', 'ppc64le')
monkeypatch.setenv('CIBW_ARCHS_WINDOWS', 'x86') monkeypatch.setenv('CIBW_ARCHS_WINDOWS', 'x86')
@@ -110,3 +114,31 @@ def test_archs_platform_specific(platform, intercepted_build_args, monkeypatch):
assert build_options.architectures == {Architecture.x86} assert build_options.architectures == {Architecture.x86}
elif platform == 'macos': elif platform == 'macos':
assert build_options.architectures == {Architecture.x86_64} assert build_options.architectures == {Architecture.x86_64}
def test_archs_platform_native(platform, intercepted_build_args, monkeypatch):
monkeypatch.setenv('CIBW_ARCHS', 'native')
main()
build_options = intercepted_build_args.args[0]
if platform == 'linux':
assert build_options.architectures == {Architecture.x86_64}
elif platform == 'windows':
assert build_options.architectures == {Architecture.AMD64}
elif platform == 'macos':
assert build_options.architectures == {Architecture.x86_64}
def test_archs_platform_all(platform, intercepted_build_args, monkeypatch):
monkeypatch.setenv('CIBW_ARCHS', 'all')
main()
build_options = intercepted_build_args.args[0]
if platform == 'linux':
assert build_options.architectures == {Architecture.x86_64, Architecture.i686, Architecture.aarch64, Architecture.ppc64le, Architecture.s390x}
elif platform == 'windows':
assert build_options.architectures == {Architecture.x86, Architecture.AMD64}
elif platform == 'macos':
assert build_options.architectures == {Architecture.x86_64}