Skip to content

CI Adds manylinux1 to building wheels #19235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jan 25, 2021
Merged

CI Adds manylinux1 to building wheels #19235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
06ab188
CI Adds manylinux1 [cd build]
thomasjpfan Jan 21, 2021
cafc888
WIP Check build matrix [cd build]
thomasjpfan Jan 21, 2021
ae2273f
WIP Check build matrix [cd build]
thomasjpfan Jan 21, 2021
716cc79
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 21, 2021
c3cced0
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 21, 2021
5fb3dc2
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 21, 2021
c59e62e
ENH Adds manylinux1 wheels [cd build] [ci skip]
thomasjpfan Jan 21, 2021
b97bcc1
ENH Uses suggestion
thomasjpfan Jan 22, 2021
b6a1e52
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 22, 2021
f310220
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 22, 2021
74382ac
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 22, 2021
6aced2f
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 22, 2021
d8deff4
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 22, 2021
9f341af
WIP Check build matrix [cd build] [ci skip]
thomasjpfan Jan 22, 2021
8a0f17c
WIP Check build matrix [cd build]
thomasjpfan Jan 22, 2021
6f5990a
WIP Check build matrix [cd build]
thomasjpfan Jan 22, 2021
578e62a
WIP Check build matrix [cd build]
thomasjpfan Jan 22, 2021
136908f
ENH Check build matrix [cd build]
thomasjpfan Jan 22, 2021
043de87
Merge remote-tracking branch 'upstream/master' into ci_manylinux1
thomasjpfan Jan 22, 2021
a91902b
Merge remote-tracking branch 'upstream/main' into ci_manylinux1
thomasjpfan Jan 22, 2021
414bbcf
Trigger [cd build]
ogrisel Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

# Build the wheels for Linux, Windows and macOS for Python 3.6 and newer
build_wheels:
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}
name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }}
runs-on: ${{ matrix.os }}
needs: check_build_trigger
if: needs.check_build_trigger.outputs.build
Expand All @@ -50,6 +50,7 @@ jobs:
os: [windows-latest, ubuntu-latest, macos-latest]
python: [36, 37, 38, 39]
bitness: [32, 64]
manylinux_image: [manylinux1, manylinux2010]
include:
# Run 32 and 64 bit version in parallel for Linux and Windows
- os: windows-latest
Expand All @@ -70,6 +71,12 @@ jobs:
exclude:
- os: macos-latest
bitness: 32
# Remove manylinux1 from the windows and osx build matrix since
# manylinux_image is not used for these platforms
- os: windows-latest
manylinux_image: manylinux1
- os: macos-latest
manylinux_image: manylinux1

steps:
- name: Checkout scikit-learn
Expand All @@ -88,6 +95,8 @@ jobs:
SKLEARN_BUILD_PARALLEL=3
MACOSX_DEPLOYMENT_TARGET=10.13
CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }}
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }}
CIBW_MANYLINUX_I686_IMAGE: ${{ matrix.manylinux_image }}
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: bash build_tools/github/repair_windows_wheels.sh {wheel} {dest_dir} ${{ matrix.bitness }}
CIBW_BEFORE_TEST_WINDOWS: bash build_tools/github/build_minimal_windows_image.sh ${{ matrix.python }} ${{ matrix.bitness }}
CIBW_TEST_REQUIRES: pytest pandas threadpoolctl
Expand Down
6 changes: 3 additions & 3 deletions build_tools/github/check_wheels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
build_matrix = wheel_config['jobs']['build_wheels']['strategy']['matrix']
n_python_versions = len(build_matrix['python'])

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

# plus one more for the sdist
n_wheels += 1
Expand Down