update baseline mac deployment target to 10.15

Author: minrk

.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
     continue-on-error: ${{ matrix.zmq == 'head' }}
 
     env:
-      MACOSX_DEPLOYMENT_TARGET: "11.7"
+      MACOSX_DEPLOYMENT_TARGET: "13.7"
 
     strategy:
       fail-fast: true

.github/workflows/wheels.yml

@@ -62,7 +62,7 @@ jobs:
     name: wheel-${{ matrix.name }}
 
     env:
-      MACOSX_DEPLOYMENT_TARGET: "10.9"
+      MACOSX_DEPLOYMENT_TARGET: "10.15"
       CIBW_BUILD: "${{ matrix.cibw.build || '*' }}"
       CIBW_SKIP: "${{ matrix.cibw.skip || '' }}"
       CIBW_ARCHS: "${{ matrix.cibw.arch || 'auto' }}"

pyproject.toml

@@ -165,9 +165,8 @@ before-all = "bash tools/install_libzmq.sh"
 repair-wheel-command = "delocate-wheel --sanitize-rpaths --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
 
 [tool.cibuildwheel.macos.environment]
-# note: everything here needs to also be duplicated in overrides below
 ZMQ_PREFIX = "/tmp/zmq"
-MACOSX_DEPLOYMENT_TARGET = "10.9"
+MACOSX_DEPLOYMENT_TARGET = "10.15"
 
 [tool.cibuildwheel.windows]
 before-all = "python buildutils/bundle.py licenses"
@@ -190,10 +189,6 @@ repair-wheel-command = """\
 "cmake.define.ZMQ_HAVE_IPC" = "OFF"
 "cmake.define.POLLER" = "select"
 
-# mac-arm target is 10.15
-[[tool.cibuildwheel.overrides]]
-select = "*macos*{universal2,arm64}*"
-environment = { ZMQ_PREFIX = "/tmp/zmq", MACOSX_DEPLOYMENT_TARGET = "10.15" }
 
 # manylinux2010 for (less) old cp37-9, pp37-8
 [[tool.cibuildwheel.overrides]]

tools/install_libzmq.sh

@@ -8,6 +8,9 @@ LICENSE_DIR="$PYZMQ_DIR/licenses"
 test -d "$LICENSE_DIR" || mkdir "$LICENSE_DIR"
 
 if [[ "$(uname)" == "Darwin" ]]; then
+    # make sure deployment target is set
+    echo "${MACOSX_DEPLOYMENT_TARGET=}"
+    test ! -z "${MACOSX_DEPLOYMENT_TARGET}"
     # need LT_MULTI_MODULE or libtool will strip out
     # all multi-arch symbols at the last step
     export LT_MULTI_MODULE=1