update cibuildwheel to 3.1 (adds Python 3.14, android wheels) (#2113)

Author: minrk

.github/workflows/wheels.yml

@@ -67,6 +67,7 @@ jobs:
       CIBW_SKIP: "${{ matrix.cibw.skip || '' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"
       CIBW_MANYLINUX_X86_64_IMAGE: "${{ matrix.cibw.manylinux_x86_64_image || '' }}"
+      CIBW_PLATFORM: "${{ matrix.cibw.platform || 'auto' }}"
 
     strategy:
       fail-fast: false
@@ -116,6 +117,12 @@ jobs:
             cibw:
               build: "*musllinux*"
 
+          - name: android
+            os: ubuntu-24.04
+            cibw:
+              platform: android
+              arch: all
+
           - name: win32
             os: windows-2022
             architecture: x86
@@ -140,10 +147,10 @@ jobs:
             cibw:
               arch: ARM64
               # FIXME:
-              # 313t fails with:
+              # 313t and 314t fail with:
               # Could NOT find Python (missing: Interpreter Development.Module) (found version "3.13.4")
               # unclear why
-              skip: "cp313t*"
+              skip: "cp31{3,4}t*"
 
     steps:
       - uses: actions/checkout@v4

CMakeLists.txt

@@ -1,12 +1,25 @@
-cmake_minimum_required(VERSION 3.14...3.28)
+cmake_minimum_required(VERSION 3.14...4.1)
 project(${SKBUILD_PROJECT_NAME} LANGUAGES C CXX)
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+message(STATUS "Building pyzmq for ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION}")
+
+if(ANDROID)
+  # Android seems to need to link libpython,
+  # which means Development.Embed
+  set(EXTRA_PYTHON_COMPONENT "Development.Embed")
+endif()
+
 find_package(
   Python
-  COMPONENTS Interpreter Development.Module ${SKBUILD_SABI_COMPONENT}
-  REQUIRED)
+  COMPONENTS
+    Interpreter
+    Development.Module
+    ${EXTRA_PYTHON_COMPONENT}
+    ${SKBUILD_SABI_COMPONENT}
+  REQUIRED
+)
 
 # Python_SOABI isn't always right when cross-compiling
 # SKBUILD_SOABI seems to be
@@ -267,6 +280,15 @@ if (ZMQ_PREFIX STREQUAL "bundled")
         --disable-shared
         --enable-static
       )
+
+      # add --host for cross compiling
+      message(STATUS "Cross: ${CMAKE_CROSSCOMPILING} $ENV{CIBW_HOST_TRIPLET}")
+      if(CMAKE_CROSSCOMPILING AND DEFINED ENV{CIBW_HOST_TRIPLET})
+        message(STATUS "Cross compiling libsodium for host: $ENV{CIBW_HOST_TRIPLET}")
+        list(APPEND libsodium_configure "--host=$ENV{CIBW_HOST_TRIPLET}")
+        message(STATUS "Cross compiling libsodium for host: $ENV{CIBW_HOST_TRIPLET} ${libsodium_configure}")
+      endif()
+
       list(APPEND libsodium_configure ${PYZMQ_LIBSODIUM_CONFIGURE_ARGS})
       execute_process(
         COMMAND ${libsodium_configure}
@@ -456,6 +478,11 @@ else()
   message(FATAL_ERROR "should have a libzmq target ${libzmq_target} to link to...")
 endif()
 
+if (ANDROID)
+  message(STATUS "Android: linking libpython ${Python_LIBRARIES}")
+  target_link_libraries(${ZMQ_EXT_NAME} PRIVATE Python::Python)
+endif()
+
 target_include_directories(${ZMQ_EXT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/zmq/utils")
 install(TARGETS ${ZMQ_EXT_NAME} DESTINATION "${ZMQ_BACKEND_DEST}" COMPONENT pyzmq)
 

cmake/Findsodium.cmake

@@ -4,6 +4,11 @@
 message(CHECK_START "Looking for pyzmq-bundled libsodium")
 set(SODIUM_FOUND FALSE)
 
+# when cross-compiling, paths are ignored by default
+# only search given PATHs, never root for libsodium
+set(SAVE_ROOT_PATH_MODE "${CMAKE_FIND_ROOT_PATH_MODE_LIBRARY}")
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY "NEVER")
+
 set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
 find_package(PkgConfig QUIET)
 if (PkgConfig_FOUND)
@@ -21,18 +26,22 @@ if (NOT SODIUM_FOUND)
   find_library(
       SODIUM_LIBRARIES
       NAMES libsodium.a libsodium.lib
-      PATH ${BUNDLE_DIR}/lib
+      PATHS ${BUNDLE_DIR}/lib
+      NO_DEFAULT_PATH
   )
   message(STATUS "Found bundled ${SODIUM_LIBRARIES} in ${BUNDLE_DIR}")
   if (SODIUM_LIBRARIES)
     # pkg-config didn't work, what do we need?
-    if (NOT MSVC)
+    if (NOT MSVC AND NOT ANDROID)
       list(APPEND SODIUM_LIBRARIES pthread)
     endif()
     set(SODIUM_FOUND TRUE)
   endif()
 endif()
 
+# restore CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY "${SAVE_ROOT_PATH_MODE}")
+
 if (NOT SODIUM_FOUND)
   message(CHECK_FAIL "no")
   message(FATAL_ERROR "Failed to find bundled libsodium")

pyproject.toml

@@ -153,9 +153,14 @@ search = '__version__: str = "{current_version}"'
 build-verbosity = "1"
 enable = ["cpython-freethreading", "pypy", "pypy-eol"]
 test-requires = ["pytest>=6", "importlib_metadata"]
-test-command = "pytest -vsx {package}/tools/test_wheel.py"
+test-sources = ["tools/test_wheel.py"]
+test-command = "python -m pytest -vsx tools/test_wheel.py"
 build-frontend = "build"
 
+# android test env doesn't work on GitHub CI
+# "x86_64 emulation currently requires hardware acceleration!"
+test-skip = "*-android*"
+
 [tool.cibuildwheel.environment]
 NO_CYTHON_COMPILE = "true"
 
@@ -202,6 +207,10 @@ repair-wheel-command = """\
 "cmake.define.ZMQ_HAVE_IPC" = "OFF"
 "cmake.define.POLLER" = "select"
 
+[tool.cibuildwheel.android.environment]
+# 24 needed for c++
+ANDROID_API_LEVEL = "24"
+
 # manylinux2014 for old Python <= 3.9
 [[tool.cibuildwheel.overrides]]
 select = "cp3{8,9}-* pp3{8,9}-*"

tools/wheel-requirements.txt

@@ -1,3 +1,3 @@
 abi3audit
-cibuildwheel==3.0.*
+cibuildwheel==3.1.*
 delvewheel==1.11.*; sys_platform == 'win32'