Skip to content

GH-41696: [Python][Packaging] Bump MACOSX_DEPLOYMENT_TARGET to 12 instead of 11 #43137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raulcd merged 20 commits into from
Aug 29, 2024
Merged

GH-41696: [Python][Packaging] Bump MACOSX_DEPLOYMENT_TARGET to 12 instead of 11 #43137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9b43551
GH-41696: [Python][Packaging] Bump MacOS Deployment Target to 12 inst…
raulcd Jul 3, 2024
6585ff5
Update VCPKG_OSX_DEPLOYMENT_TARGET to 12.0
raulcd Jul 3, 2024
aa286a4
Other possible updates required to bump everything to macOS 12
raulcd Jul 3, 2024
6c31823
Revert "Update VCPKG_OSX_DEPLOYMENT_TARGET to 12.0"
raulcd Aug 27, 2024
3585034
Revert back CMake and upgrade to monterey
raulcd Aug 27, 2024
68a43c8
Update from catalina to monterey
raulcd Aug 27, 2024
c933d70
Try big sur instead of monterey
raulcd Aug 27, 2024
8980ca6
Try again monterey deployment target using monterey github runner
raulcd Aug 27, 2024
472f258
Try explicitly set SHARED_PRIVATE_LINK_LIBS with ARROW_OPENSSL_LIBS t…
raulcd Aug 27, 2024
2a372f0
Revert setting ARROW_FLIGHT_SHARED_PRIVATE_LINK_LIBS and add -no_fixu…
raulcd Aug 27, 2024
a7b6d25
Make the linter happy
raulcd Aug 27, 2024
7600953
Revert back adding -no_fixup_chains
raulcd Aug 27, 2024
5bc0bda
Add verbose Makefile info
raulcd Aug 28, 2024
826abaa
Add OpenSSL libs to ARROW_FLIGHT_LINK_LIBS
raulcd Aug 28, 2024
b21f247
Update VCPKG_OSX_DEPLOYMENT_TARGET and CMAKE_OSX_DEPLOYMENT_TARGET to…
raulcd Aug 28, 2024
d159b6a
Update from big-sur to monterey
raulcd Aug 28, 2024
ae29215
Revert updating swift file
raulcd Aug 28, 2024
823e0ef
Remove CMAKE_VERBOSE_MAKEFILE
raulcd Aug 28, 2024
47df184
Fix platform tag for arm64 wheels in order to validate uploaded artif…
raulcd Aug 28, 2024
2a2052e
Add comment + check for only link OpenSSL with flight on APPLE
raulcd Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
ARROW_BUILD_TESTS: OFF
PYARROW_TEST_LARGE_MEMORY: ON
# Current oldest supported version according to https://endoflife.date/macos
MACOSX_DEPLOYMENT_TARGET: 10.15
MACOSX_DEPLOYMENT_TARGET: 12.0
steps:
- name: Checkout Arrow
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/python_wheel_macos_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ rm -rf ${source_dir}/python/pyarrow/*.so.*

echo "=== (${PYTHON_VERSION}) Set SDK, C++ and Wheel flags ==="
export _PYTHON_HOST_PLATFORM="macosx-${MACOSX_DEPLOYMENT_TARGET}-${arch}"
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-10.15}
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-12.0}
export SDKROOT=${SDKROOT:-$(xcrun --sdk macosx --show-sdk-path)}

if [ $arch = "arm64" ]; then
Expand Down
2 changes: 1 addition & 1 deletion ci/vcpkg/arm64-osx-static-debug.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ set(VCPKG_LIBRARY_LINKAGE static)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES arm64)
set(VCPKG_OSX_DEPLOYMENT_TARGET "11.0")
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(VCPKG_BUILD_TYPE debug)
2 changes: 1 addition & 1 deletion ci/vcpkg/arm64-osx-static-release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ set(VCPKG_LIBRARY_LINKAGE static)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES arm64)
set(VCPKG_OSX_DEPLOYMENT_TARGET "11.0")
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(VCPKG_BUILD_TYPE release)
2 changes: 1 addition & 1 deletion ci/vcpkg/universal2-osx-static-debug.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ set(VCPKG_LIBRARY_LINKAGE static)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES "x86_64;arm64")
set(VCPKG_OSX_DEPLOYMENT_TARGET "10.15")
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(VCPKG_BUILD_TYPE debug)
2 changes: 1 addition & 1 deletion ci/vcpkg/universal2-osx-static-release.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ set(VCPKG_LIBRARY_LINKAGE static)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES "x86_64;arm64")
set(VCPKG_OSX_DEPLOYMENT_TARGET "10.15")
set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")

set(VCPKG_BUILD_TYPE release)
6 changes: 6 additions & 0 deletions cpp/src/arrow/flight/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ endif()
if(WIN32)
list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()
# Updating the MACOSX_DEPLOYMENT_TARGET to 12 required us to explicitly
# link Flight with OpenSSL on macOS. Read this comment for more details:
# https://github.com/apache/arrow/pull/43137#pullrequestreview-2267476893
if(APPLE AND ARROW_USE_OPENSSL)
list(APPEND ARROW_FLIGHT_LINK_LIBS ${ARROW_OPENSSL_LIBS})
endif()

set(ARROW_FLIGHT_TEST_LINKAGE "${ARROW_TEST_LINKAGE}")
if(Protobuf_USE_STATIC_LIBS)
Expand Down
10 changes: 5 additions & 5 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ tasks:

{############################## Wheel macOS ####################################}

{% for macos_version, macos_codename in [("10.15", "catalina")] %}
{% for macos_version, macos_codename in [("12.0", "monterey")] %}
{% set platform_tag = "macosx_{}_x86_64".format(macos_version.replace('.', '_')) %}

wheel-macos-{{ macos_codename }}-{{ python_tag }}-amd64:
Expand All @@ -424,25 +424,25 @@ tasks:
arrow_jemalloc: "ON"
python_version: "{{ python_version }}"
macos_deployment_target: "{{ macos_version }}"
runs_on: "macos-13"
runs_on: "macos-12"
vcpkg_arch: "amd64"
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl

{% endfor %}

wheel-macos-big-sur-{{ python_tag }}-arm64:
wheel-macos-monterey-{{ python_tag }}-arm64:
ci: github
template: python-wheels/github.osx.yml
params:
arch: "arm64"
arrow_jemalloc: "OFF"
python_version: "{{ python_version }}"
macos_deployment_target: "11.0"
macos_deployment_target: "12.0"
runs_on: "macos-14"
vcpkg_arch: "arm64"
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ python_tag }}-macosx_11_0_arm64.whl
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ python_tag }}-macosx_12_0_arm64.whl

{############################## Wheel Windows ################################}

Expand Down
2 changes: 1 addition & 1 deletion dev/tasks/verify-rc/github.macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{% set use_conda = use_conda|default(False) %}
# env: is generated by macros.github_header()
# Current oldest supported version according to https://endoflife.date/macos
MACOSX_DEPLOYMENT_TARGET: "10.15"
MACOSX_DEPLOYMENT_TARGET: "12.0"

jobs:
verify:
Expand Down
2 changes: 1 addition & 1 deletion python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ set(CMAKE_MACOSX_RPATH 1)
if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET})
set(CMAKE_OSX_DEPLOYMENT_TARGET $ENV{MACOSX_DEPLOYMENT_TARGET})
else()
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)
endif()

# Generate a Clang compile_commands.json "compilation database" file for use
Expand Down
2 changes: 1 addition & 1 deletion ruby/red-arrow/ext/arrow/extconf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
symbols_in_external_bundles.each do |symbol|
$DLDFLAGS << " -Wl,-U,#{symbol}"
end
mmacosx_version_min = "-mmacosx-version-min=10.15"
mmacosx_version_min = "-mmacosx-version-min=12.0"
$CFLAGS << " #{mmacosx_version_min}"
$CXXFLAGS << " #{mmacosx_version_min}"
end
Expand Down