Skip to content
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

Jump to bottom

ARROW-17554: [Python][Packaging] Stop producing macOS Mavericks wheels #13996

Merged
merged 3 commits into from
Aug 29, 2022
Merged

ARROW-17554: [Python][Packaging] Stop producing macOS Mavericks wheels #13996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2313b2
ARROW-17554: [Python][Packaging] Stop producing macOS Mavericks wheels
pitrou Aug 29, 2022
45eedaa
Fix template
pitrou Aug 29, 2022
c1873d5
Enable S3 support in vcpkg step
pitrou Aug 29, 2022
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
41 changes: 0 additions & 41 deletions ci/scripts/install_osx_sdk.sh
View file
Open in desktop

This file was deleted.

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.9}
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:-10.13}
export SDKROOT=${SDKROOT:-$(xcrun --sdk macosx --show-sdk-path)}

if [ $arch = "arm64" ]; then
Expand Down
8 changes: 1 addition & 7 deletions dev/tasks/python-wheels/github.osx.amd64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
{{ macros.github_header() }}

env:
ARROW_S3: {{ arrow_s3 }}
pitrou marked this conversation as resolved.
Show resolved Hide resolved
CC: "clang"
CXX: "clang++"
MACOSX_DEPLOYMENT_TARGET: "{{ macos_deployment_target }}"
Expand Down Expand Up @@ -82,11 +81,6 @@ jobs:

- name: Install Packages
run: |
if [ "${ARROW_S3}" == "ON" ]; then
x_feature_s3="--x-feature=s3"
else
x_feature_s3=
fi
vcpkg install \
--clean-after-build \
--x-install-root=${VCPKG_ROOT}/installed \
Expand All @@ -95,7 +89,7 @@ jobs:
--x-feature=gcs \
--x-feature=json \
--x-feature=parquet \
${x_feature_s3}
--x-feature=s3

- name: Install Python {{ python_version }}
shell: bash
Expand Down
8 changes: 2 additions & 6 deletions dev/tasks/tasks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down Expand Up @@ -1600,4 +1596,4 @@ tasks:
pr_number: Unset
artifacts: "build/docs.tar.gz"
flags: "-v $PWD/build/:/build/"
image: ubuntu-docs
image: ubuntu-docs
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 @@ -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
Expand Down