Skip to content

CI Fixes wheel building #22051

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 5 commits into from
Dec 24, 2021
Merged

CI Fixes wheel building #22051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2ab0df
CI Fixes wheel building
thomasjpfan Dec 21, 2021
aa8cd96
CI [cd build]
thomasjpfan Dec 21, 2021
b6c4626
CI Skip some tests on 32bit [cd build]
thomasjpfan Dec 21, 2021
e1d6e28
CI Pin scipy versions to build manylinux1 [cd build]
thomasjpfan Dec 22, 2021
2c91bb1
Revert "CI Pin scipy versions to build manylinux1 [cd build]"
thomasjpfan Dec 22, 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
18 changes: 9 additions & 9 deletions .github/workflows/wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,22 +80,22 @@ jobs:
bitness: 32
platform_id: win32

# Linux 64 bit manylinux1
# Linux 64 bit manylinux2014
- os: ubuntu-latest
python: 37
bitness: 64
platform_id: manylinux_x86_64
manylinux_image: manylinux1
manylinux_image: manylinux2014
- os: ubuntu-latest
python: 38
bitness: 64
platform_id: manylinux_x86_64
manylinux_image: manylinux1
manylinux_image: manylinux2014
- os: ubuntu-latest
python: 39
bitness: 64
platform_id: manylinux_x86_64
manylinux_image: manylinux1
manylinux_image: manylinux2014

# Linux 64 bit manylinux2010
- os: ubuntu-latest
Expand All @@ -113,30 +113,30 @@ jobs:
bitness: 64
platform_id: manylinux_x86_64
manylinux_image: manylinux2010

# NumPy on Python 3.10 only supports 64bit and is only available with manylinux2014
- os: ubuntu-latest
python: 310
bitness: 64
platform_id: manylinux_x86_64
manylinux_image: manylinux2014

# Linux 32 bit manylinux1
# Linux 32 bit manylinux2014
- os: ubuntu-latest
python: 37
bitness: 32
platform_id: manylinux_i686
manylinux_image: manylinux1
manylinux_image: manylinux2014
- os: ubuntu-latest
python: 38
bitness: 32
platform_id: manylinux_i686
manylinux_image: manylinux1
manylinux_image: manylinux2014
- os: ubuntu-latest
python: 39
bitness: 32
platform_id: manylinux_i686
manylinux_image: manylinux1
manylinux_image: manylinux2014

# Linux 32 bit manylinux2010
- os: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[build-system]
# Minimum requirements for the build system to execute.
requires = [
"setuptools",
"setuptools<60.0",
"wheel",
"Cython>=0.28.5",

Expand Down
2 changes: 2 additions & 0 deletions sklearn/linear_model/tests/test_quantile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
from sklearn.linear_model import HuberRegressor, QuantileRegressor
from sklearn.metrics import mean_pinball_loss
from sklearn.utils._testing import assert_allclose
from sklearn.utils._testing import skip_if_32bit
from sklearn.utils.fixes import parse_version, sp_version


Expand Down Expand Up @@ -268,6 +269,7 @@ def test_linprog_failure():
reg.fit(X, y)


@skip_if_32bit
@pytest.mark.skipif(
sp_version <= parse_version("1.6.0"),
reason="Solvers are available as of scipy 1.6.0",
Expand Down
1 change: 1 addition & 0 deletions sklearn/svm/tests/test_sparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ def kfunc(x, y):
assert_array_equal(clf_lin.predict(X_sp), clf_mylin.predict(X_sp))


@skip_if_32bit
def test_svc_iris():
# Test the sparse SVC with the iris dataset
for k in ("linear", "poly", "rbf"):
Expand Down