From 97c8b6da782f0fb4f047b845bbab29b31f6a9020 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Sun, 10 Nov 2024 20:12:34 +0100 Subject: [PATCH] fix: test `uv` on `armv7l` (#1707) --- docker/manylinux-entrypoint | 2 +- tests/run_tests.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/manylinux-entrypoint b/docker/manylinux-entrypoint index bbe06c0a..e1289aca 100755 --- a/docker/manylinux-entrypoint +++ b/docker/manylinux-entrypoint @@ -6,7 +6,7 @@ if [ "${AUDITWHEEL_ARCH}" == "i686" ] && [ "$(uname -m)" == "x86_64" ]; then linux32 "$@" elif [ "${AUDITWHEEL_ARCH}" == "armv7l" ] && [ "$(uname -m)" != "armv7l" ]; then if [ "$(linux32 uname -m)" == "armv8l" ]; then - export _PYTHON_HOST_PLATFORM="linux_armv7l" + export _PYTHON_HOST_PLATFORM="linux-armv7l" fi linux32 "$@" else diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 7459592d..7e1b1af8 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -97,9 +97,8 @@ for PYTHON in /opt/python/*/bin/python; do echo "invalid answer, expecting 42" exit 1 fi - if [ "${PYVERS}" != "3.6" ] && [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "armv7l" ] && [ "${AUDITWHEEL_ARCH}" != "riscv64" ]; then + if [ "${PYVERS}" != "3.6" ] && [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "riscv64" ]; then # no uv on musllinux s390x - # FIXME, armv7l test fails on Travis CI but works with qemu (maybe armv8l vs armv7l ?) UV_PYTHON=/tmp/uv-test-${IMPLEMENTATION}${PYVERS}/bin/python uv venv --python ${PYTHON} /tmp/uv-test-${IMPLEMENTATION}${PYVERS} uv pip install --python ${UV_PYTHON} ${REPAIRED_WHEEL}