From 957ec31e0dc9f9fcd1b35231731211c196d677fc Mon Sep 17 00:00:00 2001 From: Mirko Galimberti Date: Fri, 11 Oct 2024 22:33:41 +0200 Subject: [PATCH] Bump MACOSX_DEPLOYMENT_TARGET=10.13 as is the minimum supported by Python 3.13 --- .ci/build_wheels_osx.sh | 2 +- .ci/merge_osx_deps.sh | 2 +- .github/workflows/pythonapp.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/build_wheels_osx.sh b/.ci/build_wheels_osx.sh index efb0c23..7002f7a 100644 --- a/.ci/build_wheels_osx.sh +++ b/.ci/build_wheels_osx.sh @@ -14,7 +14,7 @@ export PATH="$BUILD_PATH/bin:/usr/local/bin/:$PATH" export PKG_CONFIG_PATH="$BUILD_PATH/lib/pkgconfig:/usr/lib/pkgconfig/:$PKG_CONFIG_PATH" export CC="/usr/bin/clang" export CXX="/usr/bin/clang" -export MACOSX_DEPLOYMENT_TARGET=10.9 +export MACOSX_DEPLOYMENT_TARGET=10.13 if [ "$ARCH" = "x86_64" ]; then ARCH2=x86_64 diff --git a/.ci/merge_osx_deps.sh b/.ci/merge_osx_deps.sh index 1d5c355..77a2574 100644 --- a/.ci/merge_osx_deps.sh +++ b/.ci/merge_osx_deps.sh @@ -6,7 +6,7 @@ py_osx_ver=$(echo ${MACOSX_DEPLOYMENT_TARGET} | sed "s/\./_/g") py_osx_ver_arm=$(echo ${MACOSX_DEPLOYMENT_TARGET_ARM} | sed "s/\./_/g") for whl in *.whl; do if [[ "$whl" == *macosx_${py_osx_ver}_x86_64.whl ]]; then - whl_base=$(echo "$whl" | rev | cut -c 23- | rev) + whl_base=$(echo "$whl" | rev | cut -c 24- | rev) if [[ -f "${whl_base}macosx_${py_osx_ver_arm}_arm64.whl" ]]; then delocate-merge "$whl" "${whl_base}macosx_${py_osx_ver_arm}_arm64.whl" fi diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 56466ba..f0221d5 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -7,7 +7,7 @@ env: SDL_VERSION: "2.26.4" # https://github.com/libsdl-org/SDL/releases SDL_MIXER_VERSION: "2.6.3" # https://github.com/libsdl-org/SDL_mixer/releases USE_SDL2_MIXER: "1" - MACOSX_DEPLOYMENT_TARGET: "10.9" + MACOSX_DEPLOYMENT_TARGET: "10.13" MACOSX_DEPLOYMENT_TARGET_ARM: "11.0" jobs: