This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new 8e7122d91 ci: bump cibuildwheel (#2221)
8e7122d91 is described below
commit 8e7122d916521cae4313b65cda5dd6e23250e5cf
Author: David Li <[email protected]>
AuthorDate: Tue Oct 8 15:11:15 2024 +0900
ci: bump cibuildwheel (#2221)
---
.env | 2 +-
ci/docker/python-wheel-manylinux.dockerfile | 6 +++++-
ci/scripts/python_wheel_unix_build.sh | 4 +---
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.env b/.env
index 2f648eaf5..8f3288d48 100644
--- a/.env
+++ b/.env
@@ -29,7 +29,7 @@ ARCH_CONDA_FORGE=linux_64_
# Default versions for various dependencies
JDK=8
-MANYLINUX=2014
+MANYLINUX=2-28
MAVEN=3.6.3
PLATFORM=linux/amd64
PYTHON=3.9
diff --git a/ci/docker/python-wheel-manylinux.dockerfile
b/ci/docker/python-wheel-manylinux.dockerfile
index 2ebfb6826..1402f1a19 100644
--- a/ci/docker/python-wheel-manylinux.dockerfile
+++ b/ci/docker/python-wheel-manylinux.dockerfile
@@ -26,7 +26,11 @@ FROM
${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-${MANYLINUX}-vcpkg-${VCPKG
ARG ARCH
ARG GO
-RUN yum install -y docker
+# docker is aliased to podman by AlmaLinux, but we want real Docker
+# (podman is just too different)
+RUN yum remove -y docker ; yum install -y yum-utils
+RUN yum-config-manager --add-repo
https://download.docker.com/linux/centos/docker-ce.repo
+RUN yum install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin
docker-compose-plugin
# arm64v8 -> arm64
RUN wget --no-verbose https://go.dev/dl/go${GO}.linux-${ARCH/v8/}.tar.gz && \
tar -C /usr/local -xzf go${GO}.linux-${ARCH/v8/}.tar.gz && \
diff --git a/ci/scripts/python_wheel_unix_build.sh
b/ci/scripts/python_wheel_unix_build.sh
index 96691bbae..693e11fff 100755
--- a/ci/scripts/python_wheel_unix_build.sh
+++ b/ci/scripts/python_wheel_unix_build.sh
@@ -87,9 +87,7 @@ check_visibility $ADBC_SNOWFLAKE_LIBRARY
# https://github.com/pypa/pip/issues/7555
# Get the latest pip so we have in-tree-build by default
-# https://github.com/apache/arrow-adbc/issues/2163
-# Pin cibuildwheel for now
-python -m pip install --upgrade pip auditwheel 'cibuildwheel<2.21' delocate
setuptools wheel
+python -m pip install --upgrade pip auditwheel 'cibuildwheel>=2.21.2' delocate
setuptools wheel
# Build with Cython debug info
export ADBC_BUILD_TYPE="debug"
