diff --git a/.env b/.env index 2f648eaf55..8f3288d488 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/scripts/python_wheel_unix_build.sh b/ci/scripts/python_wheel_unix_build.sh index 96691bbae2..693e11fff8 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" diff --git a/docker-compose.yml b/docker-compose.yml index 1d1fdee37c..daa12043a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -135,11 +135,17 @@ services: PYTHON: ${PYTHON} REPO: ${REPO} VCPKG: ${VCPKG} + # Required to get podman-in-docker working + privileged: true + security_opt: + - "apparmor=unconfined" + - "seccomp=unconfined" volumes: - /var/run/docker.sock:/var/run/docker.sock - .:/adbc # Must set safe.directory so miniver won't error when calling git - command: "'git config --global --add safe.directory /adbc && git config --global --get safe.directory && /adbc/ci/scripts/python_wheel_unix_build.sh ${ARCH} /adbc /adbc/build'" + # Must force use of podman since docker in this container is an alias to podman + command: "'git config --global --add safe.directory /adbc && git config --global --get safe.directory && env CIBW_CONTAINER_ENGINE=podman /adbc/ci/scripts/python_wheel_unix_build.sh ${ARCH} /adbc /adbc/build'" python-wheel-manylinux-test: image: ${ARCH}/python:${PYTHON}-slim