CI Fixes wheel building (scikit-learn#22051)

glemaitre · glemaitre · commit 3773ee7da113 · 2021-12-25T12:26:49.000+01:00
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -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
@@ -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
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    "setuptools",
+    "setuptools<60.0",
     "wheel",
     "Cython>=0.28.5",
 
diff --git a/sklearn/svm/tests/test_sparse.py b/sklearn/svm/tests/test_sparse.py
@@ -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"):
