Skip to content

Commit 1f26735

Browse files
thomasjpfanogrisel
andauthored
CI Adds manylinux1 to building wheels (scikit-learn#19235)
Co-authored-by: Olivier Grisel <[email protected]>
1 parent 6f32544 commit 1f26735

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

Diff for: .github/workflows/wheels.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
# Build the wheels for Linux, Windows and macOS for Python 3.6 and newer
4040
build_wheels:
41-
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
41+
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }}
4242
runs-on: ${{ matrix.os }}
4343
needs: check_build_trigger
4444
if: needs.check_build_trigger.outputs.build
@@ -50,6 +50,7 @@ jobs:
5050
os: [windows-latest, ubuntu-latest, macos-latest]
5151
python: [36, 37, 38, 39]
5252
bitness: [32, 64]
53+
manylinux_image: [manylinux1, manylinux2010]
5354
include:
5455
# Run 32 and 64 bit version in parallel for Linux and Windows
5556
- os: windows-latest
@@ -70,6 +71,12 @@ jobs:
7071
exclude:
7172
- os: macos-latest
7273
bitness: 32
74+
# Remove manylinux1 from the windows and osx build matrix since
75+
# manylinux_image is not used for these platforms
76+
- os: windows-latest
77+
manylinux_image: manylinux1
78+
- os: macos-latest
79+
manylinux_image: manylinux1
7380

7481
steps:
7582
- name: Checkout scikit-learn
@@ -88,6 +95,8 @@ jobs:
8895
SKLEARN_BUILD_PARALLEL=3
8996
MACOSX_DEPLOYMENT_TARGET=10.13
9097
CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
98+
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
99+
CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.manylinux_image }}
91100
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: bash build_tools/github/repair_windows_wheels.sh {wheel} {dest_dir} ${{ matrix.bitness }}
92101
CIBW_BEFORE_TEST_WINDOWS: bash build_tools/github/build_minimal_windows_image.sh ${{ matrix.python }} ${{ matrix.bitness }}
93102
CIBW_TEST_REQUIRES: pytest pandas threadpoolctl

Diff for: build_tools/github/check_wheels.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
build_matrix = wheel_config['jobs']['build_wheels']['strategy']['matrix']
1212
n_python_versions = len(build_matrix['python'])
1313

14-
# For each python version we have: 5 wheels
14+
# For each python version we have: 7 wheels
1515
# 1 osx wheel (x86_64)
16-
# 2 linux wheel (i686 + x86_64)
16+
# 4 linux wheel (i686 + x86_64) * (manylinux1 + manylinux2010)
1717
# 2 windows wheel (win32 + wind_amd64)
18-
n_wheels = 5 * n_python_versions
18+
n_wheels = 7 * n_python_versions
1919

2020
# plus one more for the sdist
2121
n_wheels += 1

0 commit comments

Comments
 (0)