Skip to content

Commit f5f185c

Browse files
committed
update doc
1 parent 9eee6e4 commit f5f185c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docs/faq.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ title: Tips and tricks
1010

1111
Linux wheels are built in [`manylinux`/`musllinux` containers](https://github.com/pypa/manylinux) to provide binary compatible wheels on Linux, according to [PEP 600](https://www.python.org/dev/peps/pep-0600/) / [PEP 656](https://www.python.org/dev/peps/pep-0656/). Because of this, when building with `cibuildwheel` on Linux, a few things should be taken into account:
1212

13-
- Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24`, `dnf` for `manylinux_2_28` and `apk` for `musllinux_1_1` or `musllinux_1_2`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building.
13+
- Programs and libraries are not installed on the CI runner host, but rather should be installed inside the container - using `yum` for `manylinux2010` or `manylinux2014`, `apt-get` for `manylinux_2_24`/`manylinux_2_31`, `dnf` for `manylinux_2_28` and `apk` for `musllinux_1_1` or `musllinux_1_2`, or manually. The same goes for environment variables that are potentially needed to customize the wheel building.
1414

1515
`cibuildwheel` supports this by providing the [`CIBW_ENVIRONMENT`](options.md#environment) and [`CIBW_BEFORE_ALL`](options.md#before-all) options to setup the build environment inside the running container.
1616

docs/options.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -963,9 +963,9 @@ Platform-specific environment variables also available:<br/>
963963

964964
In configuration files, you can use a TOML array, and each line will be run sequentially - joined with `&&`.
965965

966-
Note that manylinux_2_24 builds occur inside a Debian9 docker, where
966+
Note that manylinux_2_24/manylinux_2_31 builds occur inside a debian derivative docker container, where
967967
manylinux2010 and manylinux2014 builds occur inside a CentOS one. So for
968-
`manylinux_2_24` the `CIBW_BEFORE_ALL_LINUX` command must use `apt-get -y`
968+
`manylinux_2_24`/`manylinux_2_31` the `CIBW_BEFORE_ALL_LINUX` command must use `apt-get -y`
969969
instead.
970970

971971
### `CIBW_BEFORE_BUILD` {: #before-build}
@@ -1194,9 +1194,9 @@ The available options are:
11941194

11951195
Set the Docker image to be used for building [manylinux / musllinux](https://github.com/pypa/manylinux) wheels.
11961196

1197-
For `CIBW_MANYLINUX_*_IMAGE`, the value of this option can either be set to `manylinux1`, `manylinux2010`, `manylinux2014`, `manylinux_2_24` or `manylinux_2_28` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, the `manylinux1` image is not available. For architectures other
1197+
For `CIBW_MANYLINUX_*_IMAGE`, except `CIBW_MANYLINUX_ARMV7L_IMAGE`, the value of this option can either be set to `manylinux1`, `manylinux2010`, `manylinux2014`, `manylinux_2_24` or `manylinux_2_28` to use a pinned version of the [official manylinux images](https://github.com/pypa/manylinux). Alternatively, set these options to any other valid Docker image name. For PyPy, the `manylinux1` image is not available. For architectures other
11981198
than x86 (x86\_64 and i686) `manylinux2014`, `manylinux_2_24` or `manylinux_2_28` must be used, because the first version of the manylinux specification that supports additional architectures is `manylinux2014`. `manylinux_2_28` is not supported for `i686` architecture.
1199-
`manylinux_2_31` is only supported for the `armv7l` architecture and is experimental.
1199+
For `CIBW_MANYLINUX_ARMV7L_IMAGE`, the value of this option can either be set to `manylinux_2_31` or a custom image. Support is experimental for now. The `manylinux_2_31` value is only available for `armv7`.
12001200

12011201
For `CIBW_MUSLLINUX_*_IMAGE`, the value of this option can either be set to `musllinux_1_1` or `musllinux_1_2` to use a pinned version of the [official musllinux images](https://github.com/pypa/musllinux). Alternatively, set these options to any other valid Docker image name.
12021202

0 commit comments

Comments
 (0)