Skip to content
Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f8fc629
Add manylinux_2_28 wheel
sjperkins Jan 19, 2023
bb9268d
Address review comments
sjperkins Jan 21, 2023
424fa08
Fix manylinux variable discrepancies
sjperkins Jan 21, 2023
bf6f3b1
Fix incorrect arch causing duplicate yaml keys
sjperkins Jan 21, 2023
26cc4c0
Avoid duplicate keys in task definition
sjperkins Jan 21, 2023
b490f15
fix arch and remove ci from python wheel key
sjperkins Jan 22, 2023
ee4d79d
underscores to dashes in manylinux 2_28 ccache name
sjperkins Jan 22, 2023
d196e09
Update docker-compose.yml
sjperkins Jan 22, 2023
79661a1
Update dev/tasks/tasks.yml
sjperkins Jan 22, 2023
3363331
Create unified manylinux Dockerfile
sjperkins Jan 22, 2023
1171e32
Remove unused install_glibc.sh
sjperkins Jan 22, 2023
59a0fb2
Add comments explaining placement of Python 3.8 on the PATH
sjperkins Jan 23, 2023
46579ae
Improve comment
sjperkins Jan 23, 2023
3924533
Distinguish artifact naming schema produced by auditwheel for differe…
sjperkins Jan 23, 2023
a26c20d
Correct jinja2 equality operator
sjperkins Jan 23, 2023
cc083e0
Fix jinja2 templating
sjperkins Jan 23, 2023
7bf98e2
openssl wants linux-headers on arm64 platform
sjperkins Jan 25, 2023
3c90df8
spelling
sjperkins Jan 25, 2023
d0d6894
Install basic dependencies with dnf, rather than yum
sjperkins Jan 27, 2023
3d640ca
Introduce TEST_WHEEL_PLATFORM_TAGS environment variable
sjperkins Jan 29, 2023
21a7ff1
Fix task.yml errors and lint
sjperkins Jan 29, 2023
0cc575c
Fix typo in artifact string
sjperkins Jan 30, 2023
f10be24
Merge branch 'master' into manylinux-2-28
sjperkins Feb 2, 2023
999a927
Merge branch 'master' into manylinux-2-28
sjperkins Feb 16, 2023
dbb4473
Merge branch 'main' into manylinux-2-28
sjperkins Feb 22, 2023
9c1a3dc
Merge branch 'main' into manylinux-2-28
sjperkins Feb 24, 2023
95d6827
Add --cross-compile-prefix option to openssl CMakeList.txt
sjperkins Feb 24, 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
94 changes: 94 additions & 0 deletions ci/docker/python-wheel-manylinux-x-y.dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# 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.

ARG base
FROM ${base}

ARG arch
ARG arch_short
ARG manylinux

ENV MANYLINUX_VERSION=${manylinux}

# Install basic dependencies
RUN yum install -y git flex curl autoconf zip perl-IPC-Cmd wget

ENV CPYTHON_VERSION=cp38
ENV PATH=/opt/python/${CPYTHON_VERSION}-${CPYTHON_VERSION}/bin:${PATH}
Comment thread
sjperkins marked this conversation as resolved.

# Install CMake
# AWS SDK doesn't work with CMake=3.22 due to https://gitlab.kitware.com/cmake/cmake/-/issues/22524
ARG cmake=3.21.4
COPY ci/scripts/install_cmake.sh arrow/ci/scripts/
RUN /arrow/ci/scripts/install_cmake.sh ${arch} linux ${cmake} /usr/local

# Install Ninja
ARG ninja=1.10.2
COPY ci/scripts/install_ninja.sh arrow/ci/scripts/
RUN /arrow/ci/scripts/install_ninja.sh ${ninja} /usr/local

# Install ccache
ARG ccache=4.1
COPY ci/scripts/install_ccache.sh arrow/ci/scripts/
RUN /arrow/ci/scripts/install_ccache.sh ${ccache} /usr/local

# Install vcpkg
ARG vcpkg
# PEP 600 states that a wheel tagged manylinux_x_y
# shall work on any distro based on glibc>=x.y
ARG glibc=2.28
Comment thread
sjperkins marked this conversation as resolved.
Outdated
COPY ci/vcpkg/*.patch \
ci/vcpkg/*linux*.cmake \
arrow/ci/vcpkg/
COPY ci/scripts/install_vcpkg.sh \
ci/scripts/install_glibc.sh \
arrow/ci/scripts/
ENV VCPKG_ROOT=/opt/vcpkg
RUN arrow/ci/scripts/install_vcpkg.sh ${VCPKG_ROOT} ${vcpkg}
ENV PATH="${PATH}:${VCPKG_ROOT}"

ARG build_type=release
ENV CMAKE_BUILD_TYPE=${build_type} \
VCPKG_FORCE_SYSTEM_BINARIES=1 \
VCPKG_OVERLAY_TRIPLETS=/arrow/ci/vcpkg \
VCPKG_DEFAULT_TRIPLET=${arch_short}-linux-static-${build_type} \
VCPKG_FEATURE_FLAGS="manifests"
COPY ci/vcpkg/vcpkg.json arrow/ci/vcpkg/
# cannot use the S3 feature here because while aws-sdk-cpp=1.9.160 contains
# ssl related fixies as well as we can patch the vcpkg portfile to support
# arm machines it hits ARROW-15141 where we would need to fall back to 1.8.186
# but we cannot patch those portfiles since vcpkg-tool handles the checkout of
# previous versions => use bundled S3 build
RUN vcpkg install \
--clean-after-build \
--x-install-root=${VCPKG_ROOT}/installed \
--x-manifest-root=/arrow/ci/vcpkg \
--x-feature=flight \
--x-feature=gcs \
--x-feature=json \
--x-feature=parquet

ARG python=3.8
ENV PYTHON_VERSION=${python}
RUN PYTHON_ROOT=$(find /opt/python -name cp${PYTHON_VERSION/./}-*) && \
echo "export PATH=$PYTHON_ROOT/bin:\$PATH" >> /etc/profile.d/python.sh

SHELL ["/bin/bash", "-i", "-c"]
ENTRYPOINT ["/bin/bash", "-i", "-c"]

COPY python/requirements-wheel-build.txt /arrow/python/
RUN pip install -r /arrow/python/requirements-wheel-build.txt
12 changes: 7 additions & 5 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -452,16 +452,18 @@ tasks:

{############################## Wheel Linux ##################################}

{% for ci, arch, arch_alias, x_y, manylinux in [("github", "amd64", "x86_64", "2_17", "2014"),
("travis", "arm64", "aarch64", "2_17", "2014")] %}
wheel-manylinux{{ manylinux }}-{{ python_tag }}-{{ arch }}:
{% for ci, arch, arch_alias, x_y, manylinux_version, manylinux in [("github", "amd64", "x86_64", "2_17", "2014", "manylinux2014"),
("github", "amd64", "x86_64", "2_28", "2_28", "manylinux_2_28"),
("travis", "arm64", "aarch64", "2_17", "2014", "manylinux2014"),
("travis", "arm64", "aarch64", "2_28", "2_28", "manylinux_2_28")] %}
Comment thread
sjperkins marked this conversation as resolved.
Outdated
wheel-{{ manylinux }}-{{ python_tag }}-{{ arch }}:
ci: "{{ ci }}"
template: python-wheels/{{ ci }}.linux.{{ arch }}.yml
params:
python_version: "{{ python_version }}"
manylinux_version: "{{ manylinux }}"
manylinux_version: "{{ manylinux_version }}"
artifacts:
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-manylinux_{{ x_y }}_{{ arch_alias }}.manylinux{{ manylinux }}_{{ arch_alias }}.whl
- pyarrow-{no_rc_version}-{{ python_tag }}-{{ abi_tag }}-manylinux_{{ x_y }}_{{ arch_alias }}.{{ manylinux }}_{{ arch_alias }}.whl
Comment thread
sjperkins marked this conversation as resolved.
Outdated
{% endfor %}

{############################## Wheel OSX ####################################}
Expand Down
27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ x-hierarchy:
- postgres
- python-wheel-manylinux-2014:
- java-jni-manylinux-2014
- python-wheel-manylinux-2-28
- python-wheel-manylinux-test-imports
- python-wheel-manylinux-test-unittests
- python-wheel-windows-vs2017
Expand All @@ -180,6 +181,8 @@ volumes:
name: maven-cache
python-wheel-manylinux2014-ccache:
name: python-wheel-manylinux2014-ccache
python-wheel-manylinux-2-28-ccache:
name: python-wheel-manylinux-2-28-ccache
python-wheel-windows-clcache:
name: python-wheel-windows-clcache
ubuntu-ccache:
Expand Down Expand Up @@ -967,6 +970,30 @@ services:
- ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux2014-ccache:/ccache:delegated
command: /arrow/ci/scripts/python_wheel_manylinux_build.sh

# See available versions at:
# https://quay.io/repository/pypa/manylinux_2_28_x86_64?tab=tags
python-wheel-manylinux-2-28:
image: ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
build:
args:
arch: ${ARCH}
arch_short: ${ARCH_SHORT}
base: quay.io/pypa/manylinux_2_28_${ARCH_ALIAS}:2023-01-14-103cb93
vcpkg: ${VCPKG}
python: ${PYTHON}
manylinux: 2_28
context: .
dockerfile: ci/docker/python-wheel-manylinux-x-y.dockerfile
cache_from:
- ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
environment:
<<: *ccache
volumes:
- .:/arrow:delegated
- ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux-2-28-ccache:/ccache:delegated
command: /arrow/ci/scripts/python_wheel_manylinux_build.sh


Comment thread
sjperkins marked this conversation as resolved.
Outdated
python-wheel-manylinux-test-imports:
image: ${ARCH}/python:${PYTHON}
shm_size: 2G
Expand Down