From 0c4ced7da500f8b748003e5089dde9be143bcbf2 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 29 Aug 2022 19:56:58 +0200 Subject: [PATCH] ARROW-17554: [Python][Packaging] Stop producing macOS Mavericks wheels Also remove an unused script (fixing ARROW-17555). --- ci/scripts/install_osx_sdk.sh | 41 -------------------------- ci/scripts/python_wheel_macos_build.sh | 2 +- dev/tasks/tasks.yml | 8 ++--- python/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 49 deletions(-) delete mode 100755 ci/scripts/install_osx_sdk.sh diff --git a/ci/scripts/install_osx_sdk.sh b/ci/scripts/install_osx_sdk.sh deleted file mode 100755 index 896d084e0b9d8..0000000000000 --- a/ci/scripts/install_osx_sdk.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -set -ex - -if [ ${using_homebrew} != "yes" ]; then - export MACOSX_DEPLOYMENT_TARGET="10.9" - export CONDA_BUILD_SYSROOT="$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk" - - if [[ ! -d ${CONDA_BUILD_SYSROOT} || "$OSX_FORCE_SDK_DOWNLOAD" == "1" ]]; then - echo "downloading ${macosx_deployment_target} sdk" - curl -L -O https://github.com/phracker/MacOSX-SDKs/releases/download/10.13/MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk.tar.xz - tar -xf MacOSX${MACOSX_DEPLOYMENT_TARGET}.sdk.tar.xz -C "$(dirname "$CONDA_BUILD_SYSROOT")" - # set minimum sdk version to our target - plutil -replace MinimumSDKVersion -string ${MACOSX_DEPLOYMENT_TARGET} $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist - plutil -replace DTSDKName -string macosx${MACOSX_DEPLOYMENT_TARGET}internal $(xcode-select -p)/Platforms/MacOSX.platform/Info.plist - fi - - if [ -d "${CONDA_BUILD_SYSROOT}" ]; then - echo "Found CONDA_BUILD_SYSROOT: ${CONDA_BUILD_SYSROOT}" - else - echo "Missing CONDA_BUILD_SYSROOT: ${CONDA_BUILD_SYSROOT}" - exit 1 - fi -fi diff --git a/ci/scripts/python_wheel_macos_build.sh b/ci/scripts/python_wheel_macos_build.sh index 6bd6ea22a35b9..d580e9a331e88 100755 --- a/ci/scripts/python_wheel_macos_build.sh +++ b/ci/scripts/python_wheel_macos_build.sh @@ -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.9} +export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-10.13} export SDKROOT=${SDKROOT:-$(xcrun --sdk macosx --show-sdk-path)} if [ $arch = "arm64" ]; then diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml index 40133f287a457..0816c24589e8b 100644 --- a/dev/tasks/tasks.yml +++ b/dev/tasks/tasks.yml @@ -478,9 +478,7 @@ tasks: {############################## Wheel OSX ####################################} -# enable S3 and GCS support from macOS 10.13 so we don't need to bundle curl, crypt and ssl -{% for macos_version, macos_codename, arrow_s3, arrow_gcs in [("10.9", "mavericks", "OFF", "OFF"), - ("10.13", "high-sierra", "ON", "ON")] %} +{% for macos_version, macos_codename in [("10.13", "high-sierra")] %} {% set platform_tag = "macosx_{}_x86_64".format(macos_version.replace('.', '_')) %} wheel-macos-{{ macos_codename }}-{{ python_tag }}-amd64: @@ -489,8 +487,6 @@ tasks: params: python_version: "{{ python_version }}" macos_deployment_target: "{{ macos_version }}" - arrow_s3: "{{ arrow_s3 }}" - arrow_gcs: "{{ arrow_gcs }}" artifacts: - pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-{{ platform_tag }}.whl @@ -1600,4 +1596,4 @@ tasks: pr_number: Unset artifacts: "build/docs.tar.gz" flags: "-v $PWD/build/:/build/" - image: ubuntu-docs \ No newline at end of file + image: ubuntu-docs diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 66087fb97955f..e2878f6c8ecbd 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -55,7 +55,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.9) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) endif() # Generate a Clang compile_commands.json "compilation database" file for use