BLD Build 3.10 wheel [cd build gh] (#21232)

thomasjpfan · ogrisel · glemaitre · commit f90c33fa0529 · 2021-12-25T12:26:49.000+01:00
Co-authored-by: Olivier Grisel &lt;olivier.grisel@ensta.org&gt;
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -61,6 +61,10 @@ jobs:
             python: 39
             bitness: 64
             platform_id: win_amd64
+          - os: windows-latest
+            python: 310
+            bitness: 64
+            platform_id: win_amd64
 
           # Window 32 bit
           - os: windows-latest
@@ -109,6 +113,13 @@ 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
           - os: ubuntu-latest
@@ -157,6 +168,10 @@ jobs:
             bitness: 64
             python: 39
             platform_id: macosx_x86_64
+          - os: macos-latest
+            bitness: 64
+            python: 310
+            platform_id: macosx_x86_64
 
     steps:
       - name: Checkout scikit-learn
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,9 @@
 # new container-based Travis workers
 language: python
 dist: xenial
+# Only used to install cibuildwheel, CIBW_BUILD determines the python version being
+# built in the docker image itself. Also: travis does not have 3.10 yet.
+python: 3.9
 
 cache:
   apt: true
@@ -22,7 +25,7 @@ env:
     # Custom environment variables for the ARM wheel builder
     - CIBW_BUILD_VERBOSITY=1
     - CIBW_TEST_COMMAND="bash {project}/build_tools/travis/test_wheels.sh"
-    - CIBW_ENVIRONMENT="CPU_COUNT=2
+    - CIBW_ENVIRONMENT="CPU_COUNT=4
                         OMP_NUM_THREADS=2
                         OPENBLAS_NUM_THREADS=2
                         SKLEARN_BUILD_PARALLEL=10
@@ -37,38 +40,45 @@ jobs:
     # a scheduled task to build the weekly dev build on the main branch. The
     # weekly frequency is meant to avoid depleting the Travis CI credits too
     # fast.
-    - python: 3.7
-      os: linux
+    - os: linux
       arch: arm64-graviton2
       dist: focal
-      virt: lxd
+      virt: vm
       group: edge
       if: type = cron or commit_message =~ /\[cd build\]/
       env:
-        - BUILD_WHEEL=true
         - CIBW_BUILD=cp37-manylinux_aarch64
+        - BUILD_WHEEL=true
 
-    - python: 3.8
-      os: linux
+    - os: linux
       arch: arm64-graviton2
       dist: focal
-      virt: lxd
+      virt: vm
       group: edge
       if: type = cron or commit_message =~ /\[cd build\]/
       env:
-        - BUILD_WHEEL=true
         - CIBW_BUILD=cp38-manylinux_aarch64
+        - BUILD_WHEEL=true
 
-    - python: 3.9
-      os: linux
+    - os: linux
       arch: arm64-graviton2
       dist: focal
-      virt: lxd
+      virt: vm
       group: edge
       if: type = cron or commit_message =~ /\[cd build\]/
       env:
-        - BUILD_WHEEL=true
         - CIBW_BUILD=cp39-manylinux_aarch64
+        - BUILD_WHEEL=true
+
+    - os: linux
+      arch: arm64-graviton2
+      dist: focal
+      virt: vm
+      group: edge
+      if: type = cron or commit_message =~ /\[cd build\]/
+      env:
+        - CIBW_BUILD=cp310-manylinux_aarch64
+        - BUILD_WHEEL=true
 
 install: source build_tools/travis/install.sh || travis_terminate 1
 script: source build_tools/travis/script.sh || travis_terminate 1
