Only build 1 platform wheel for macOS

Author: mayeut

.travis.yml

@@ -17,24 +17,12 @@ matrix:
         - PYTHON_VERSION=3.7.9
         - MACOSX_DEPLOYMENT_TARGET=10.10
 
-    - os: osx
-      language: generic
-      env:
-        - PYTHON_VERSION=3.7.9
-        - MACOSX_DEPLOYMENT_TARGET=10.13
-
     - os: osx
       language: generic
       env:
         - PYTHON_VERSION=2.7.18
         - MACOSX_DEPLOYMENT_TARGET=10.10
 
-    - os: osx
-      language: generic
-      env:
-        - PYTHON_VERSION=2.7.18
-        - MACOSX_DEPLOYMENT_TARGET=10.13
-
     - arch: arm64-graviton2
       virt: vm
       group: edge

CMakeLists.txt

@@ -68,10 +68,8 @@ if(CMakePythonDistributions_SUPERBUILD)
   if(APPLE)
     if("${CMAKE_OSX_DEPLOYMENT_TARGET}" VERSION_LESS "10.10")
       message(FATAL_ERROR "Unsupported macOS deployment target: ${CMAKE_OSX_DEPLOYMENT_TARGET} is less than 10.10")
-    elseif("${CMAKE_OSX_DEPLOYMENT_TARGET}" VERSION_LESS "10.13")
-      set(binary_archive "macos10_10_binary")
     else()
-      set(binary_archive "macos10_13_binary")
+      set(binary_archive "macos10_10_binary")
     endif()
   endif()
   if(WIN32)

CMakeUrls.cmake

@@ -16,9 +16,6 @@ set(linux32_binary_sha256    "NA")
 set(linux64_binary_url       "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-linux-x86_64.tar.gz")
 set(linux64_binary_sha256    "3f827544f9c82e74ddf5016461fdfcfea4ede58a26f82612f473bf6bfad8bfc2")
 
-set(macos10_13_binary_url     "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-macos-universal.tar.gz")
-set(macos10_13_binary_sha256  "0100663380a3bd977b001183cd487412db7aad9de6859927bde97e1e6e44e645")
-
 set(macos10_10_binary_url    "https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-macos10.10-universal.tar.gz")
 set(macos10_10_binary_sha256 "6d9c1c1aecb61d085b1a20503fa94b0c28abae617e20189df61eea4cf876fba0")
 

scikit-ci.yml

@@ -124,16 +124,20 @@ test:
               additional_platforms = []
               if "MACOSX_DEPLOYMENT_TARGET" in os.environ:
                   target = tuple(int(p) for p in os.environ["MACOSX_DEPLOYMENT_TARGET"].split("."))
-                  if target == (10, 13):
-                      # let's add universal2 platform for this wheel.
-                      # given pip support for universal2 was added after arm64 introduction
-                      # let's also add arm64 platform.
+                  # let's add universal2 platform for this wheel.
+                  additional_platforms = ["macosx_{}_{}_universal2".format(*target)]
+
+                  # given pip support for universal2 was added after arm64 introduction
+                  # let's also add arm64 platform.
+                  arm64_target = target
+                  if arm64_target < (11, 0):
+                      arm64_target = (11, 0)
+                  additional_platforms.append("macosx_{}_{}_arm64".format(*arm64_target))
+
+                  if target < (11, 0):
                       # They're were also issues with pip not picking up some universal2 wheels, tag twice
-                      additional_platforms = [
-                          "macosx_10_13_universal2",
-                          "macosx_11_0_universal2",
-                          "macosx_11_0_arm64",
-                      ]
+                      additional_platforms.append("macosx_11_0_universal2")
+
               for wheel in wheels:
                   convert_to_generic_platform_wheel(wheel, remove_original=True, additional_platforms=additional_platforms)
 

scripts/update_cmake_version.py

@@ -46,7 +46,6 @@ def get_cmake_archive_urls_and_sha256s(version, verbose=False):
             "cmake-%s.tar.gz" % version:                      "unix_source",
             "cmake-%s.zip" % version:                         "win_source",
             "cmake-%s-linux-x86_64.tar.gz" % version:         "linux64_binary",
-            "cmake-%s-macos-universal.tar.gz" % version:      "macos10_13_binary",
             "cmake-%s-macos10.10-universal.tar.gz" % version: "macos10_10_binary",
             "cmake-%s-windows-i386.zip" % version:            "win32_binary",
             "cmake-%s-windows-x86_64.zip" % version:          "win64_binary",
@@ -118,9 +117,6 @@ def generate_cmake_variables(urls_and_sha256s):
       set(linux64_binary_url       "{linux64_binary_url}")
       set(linux64_binary_sha256    "{linux64_binary_sha256}")
 
-      set(macos10_13_binary_url     "{macos10_13_binary_url}")
-      set(macos10_13_binary_sha256  "{macos10_13_binary_sha256}")
-
       set(macos10_10_binary_url    "{macos10_10_binary_url}")
       set(macos10_10_binary_sha256 "{macos10_10_binary_sha256}")