Skip to content

GH-36752: [Python] Remove AWS SDK bundling when building wheels #36925

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
kou merged 6 commits into from
Aug 3, 2023
Merged

GH-36752: [Python] Remove AWS SDK bundling when building wheels #36925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a9be02
GH-36752: [Python] Remove AWS SDK bundling when building wheels
raulcd Jul 28, 2023
d6a45dd
Temporary increase timeout to allow vcpkg to build
raulcd Jul 28, 2023
241e89c
Try to give the build an extremely amount of time
raulcd Jul 28, 2023
1fb7e2c
Remove AWSSDK_SOURCE=BUNDLED from Windows wheels
raulcd Aug 1, 2023
c04d057
Update Windows wheel revision to rebuild with VCPKG S3 feature enabled
raulcd Aug 2, 2023
24bb448
Revert timeout increase to build Image
raulcd Aug 3, 2023
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 .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ VCPKG="501db0f17ef6df184fcdbfbe0f87cde2313b6ab1" # 2023.04.15 Release
# ci/docker/python-wheel-windows-vs2017.dockerfile.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2022-06-12
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2023-08-02

# Use conanio/${CONAN} for "docker-compose run --rm conan". See
# https://github.com/conan-io/conan-docker-tools#readme for available
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/python-wheel-manylinux.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ RUN vcpkg install \
--x-feature=flight \
--x-feature=gcs \
--x-feature=json \
--x-feature=parquet
--x-feature=parquet \
--x-feature=s3

# Configure Python for applications running in the bash shell of this Dockerfile
ARG python=3.8
Expand Down
3 changes: 2 additions & 1 deletion ci/docker/python-wheel-windows-vs2017.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ RUN vcpkg install \
--x-feature=flight \
--x-feature=gcs \
--x-feature=json \
--x-feature=parquet
--x-feature=parquet \
--x-feature=s3

# Remove previous installations of python from the base image
# NOTE: a more recent base image (tried with 2.12.1) comes with python 3.9.7
Expand Down
1 change: 0 additions & 1 deletion ci/scripts/java_jni_macos_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ cmake \
-DARROW_PARQUET=${ARROW_PARQUET} \
-DARROW_S3=${ARROW_S3} \
-DARROW_USE_CCACHE=${ARROW_USE_CCACHE} \
-DAWSSDK_SOURCE=BUNDLED \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=${install_dir} \
Expand Down
4 changes: 0 additions & 4 deletions ci/scripts/python_wheel_manylinux_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ fi
mkdir /tmp/arrow-build
pushd /tmp/arrow-build

# ARROW-17501: We can remove -DAWSSDK_SOURCE=BUNDLED once
# https://github.com/aws/aws-sdk-cpp/issues/1809 is fixed and vcpkg
# ships the fix.
cmake \
-DARROW_ACERO=${ARROW_ACERO} \
-DARROW_BUILD_SHARED=ON \
Expand Down Expand Up @@ -120,7 +117,6 @@ cmake \
-DARROW_WITH_SNAPPY=${ARROW_WITH_SNAPPY} \
-DARROW_WITH_ZLIB=${ARROW_WITH_ZLIB} \
-DARROW_WITH_ZSTD=${ARROW_WITH_ZSTD} \
-DAWSSDK_SOURCE=BUNDLED \
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_PREFIX=/tmp/arrow-dist \
Expand Down
4 changes: 0 additions & 4 deletions ci/scripts/python_wheel_windows_build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ set ARROW_WITH_LZ4=ON
set ARROW_WITH_SNAPPY=ON
set ARROW_WITH_ZLIB=ON
set ARROW_WITH_ZSTD=ON
@rem Workaround for https://github.com/aws/aws-sdk-cpp/issues/1809 .
@rem Use (old) bundled AWS SDK C++ instead of (newer) AWS SDK C++.
set AWSSDK_SOURCE=BUNDLED
set CMAKE_UNITY_BUILD=ON
set CMAKE_GENERATOR=Visual Studio 15 2017 Win64
set VCPKG_ROOT=C:\vcpkg
Expand Down Expand Up @@ -90,7 +87,6 @@ cmake ^
-DARROW_WITH_SNAPPY=%ARROW_WITH_SNAPPY% ^
-DARROW_WITH_ZLIB=%ARROW_WITH_ZLIB% ^
-DARROW_WITH_ZSTD=%ARROW_WITH_ZSTD% ^
-DAWSSDK_SOURCE=%AWSSDK_SOURCE% ^
-DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
-DCMAKE_CXX_COMPILER=clcache ^
-DCMAKE_INSTALL_PREFIX=C:\arrow-dist ^
Expand Down