diff --git a/README.rst b/README.rst index a288ad9a..847c5900 100644 --- a/README.rst +++ b/README.rst @@ -252,7 +252,7 @@ All supported images currently contain: - `cmake `_ - `patchelf `_ - `swig `_ - - `uv `_ (not available on ``musllinux s390x`` yet due to Rust limitations) + - `uv `_ (not available on ``musllinux ppc64le`` & ``musllinux s390x`` yet due to Rust limitations) - All Python interpreters have the following packages pre-installed: - `pip `_ diff --git a/docker/build_scripts/finalize.sh b/docker/build_scripts/finalize.sh index c9f5f006..92506028 100755 --- a/docker/build_scripts/finalize.sh +++ b/docker/build_scripts/finalize.sh @@ -83,6 +83,7 @@ pipx upgrade-shared --pip-args="--no-index --find-links=/tmp/pinned-wheels" for TOOL_PATH in $(find ${MY_DIR}/requirements-tools -type f); do TOOL=$(basename ${TOOL_PATH}) case ${AUDITWHEEL_PLAT}-${TOOL} in + musllinux*_ppc64le-uv) continue;; # uv doesn't provide musl ppc64le wheels due to Rust issues musllinux*_s390x-uv) continue;; # uv doesn't provide musl s390x wheels due to Rust issues *) pipx install --pip-args="--require-hashes -r ${TOOL_PATH} --only-binary" ${TOOL};; esac diff --git a/docker/build_scripts/requirements-tools/uv b/docker/build_scripts/requirements-tools/uv index bff9e295..e571851d 100644 --- a/docker/build_scripts/requirements-tools/uv +++ b/docker/build_scripts/requirements-tools/uv @@ -1,22 +1,21 @@ # This file was autogenerated by uv via the following command: # nox -s update_python_dependencies -uv==0.5.6 \ - --hash=sha256:152466b8854bc30661620671cd1e5e854123e734fb4f380bc83eab5e3c4450a9 \ - --hash=sha256:2b1dc05b9b242989d4a6dc99916a0fd6dc98ea5146f757505da69ac20825067d \ - --hash=sha256:485decff72ba2ba6c8b82de0f8ecc877bd4080dc4e27604f3ebd9da98e00c53f \ - --hash=sha256:4ca83b575d316030503d81d3cc85a53be45d8bab56892f845f7e545006e5df59 \ - --hash=sha256:5b49db3c842dcdaccdaf8ea26770c2b18632528f68e7f3211415ae25796de71a \ - --hash=sha256:6c7afc715f48a6ddc61257ed62c74595b5762eb67a6f23696fae6e609698a990 \ - --hash=sha256:6e13c1bb1f00b596a50711afffc407570edf9825fea4cfbc1d80cfb59816e501 \ - --hash=sha256:6e14da824a775abe4f28f03c4a672df99697fdd42c5e99df40d99a7d5c90e5c8 \ - --hash=sha256:848b12fe47ee8dd871ae5cfb1fefc2bac7cdb90bd34ff1f08bf78dd751f6950a \ - --hash=sha256:87b0b77ebf036363b8b0ed55c0f4a4a687b20500e3f9aa45574dfe05f9761057 \ - --hash=sha256:8bc30ef6996c3352a45d75ebc9aeb2e7ae5ebb7b2118b6f036ddd02d4f689daa \ - --hash=sha256:920dd926d235f826454e7b68cb1890ded6e67510e6195c346eef41caabc9d9b7 \ - --hash=sha256:9297f084ca2004044a9353525777c9cb1151a0d768de87cc3920574597674f88 \ - --hash=sha256:9c1ebf58ef3906e05e0060cda4a801a45e93334169821a89effa6ba9607dfa07 \ - --hash=sha256:a15ac68584b346e592ca4c5167ffd4c4ba9906706b423b696e7b37d03dea753b \ - --hash=sha256:c1a3b180e90734812034cc1594256f519bff6c2715f3f1ceb9ac7bc578005f5d \ - --hash=sha256:eae7301bd35891545a4e139b0f1bd5aa7981afba43654233297be463d6d6ba8b \ - --hash=sha256:f2e6a13da16b8a3a43d50a1be5910c4e55b04889bcacfb8c9a22dcff817fa326 +uv==0.5.9 \ + --hash=sha256:18ec1248a6d027f89d9ffb51079227373f3af42ca0d3f684047aec81793657d6 \ + --hash=sha256:1e93705005f4f74a768085908acee92d4ef5d816ffb51e9a6596ace6b7d0a3ad \ + --hash=sha256:338c517bb47cd686e104ac63d3ad617f37cf4309eb582b39e6826f071f5e7916 \ + --hash=sha256:3fbaff3161694b5b349fc7286ceac343121a755c62a32b871c3ad5f781dca23c \ + --hash=sha256:405b8e0f26ad33eb35b138160e9d5752e39bf91e832df0235ce6992263a60572 \ + --hash=sha256:429f4b27d35aa23b07b493f360e9bbaf281c8ef179ad3fb97c58ad118fbe29c5 \ + --hash=sha256:45e59c8895a3ae0d7b09c913288749c82892d04d9d67a2baa96c24eb6d13e6cb \ + --hash=sha256:4db031dba3b948a76a1ce2599bf64db8cb0c3a05de9c0c717fba0ce5c346997c \ + --hash=sha256:5925399f92df8b1d030aca5009f3e889446de5bd2477c869627572de3ed1a701 \ + --hash=sha256:6ed5ef05fc98cf6129c1c674c2b5e8a99eff1ae1eebd47ab60dde010a307784a \ + --hash=sha256:c4640eba930cd492f74b75ed6eee4754048ea01371621762e4b7318b9d33d2ab \ + --hash=sha256:d0834cdb59ca23d42296092c55c1dd1157b18300234f32a82320a78645766ad5 \ + --hash=sha256:d8e384e2961f4ed5b21928f3f8ed7d7f5c8eb4607cbab84610958500360e5723 \ + --hash=sha256:db6bae19df1dff43b890032fd9025983c38ac418beda19b02e043630428a19d8 \ + --hash=sha256:ee37165a9b03d7cd07dab8272e5cd5c36da30a54b28f08f301a0ee67526e9006 \ + --hash=sha256:f7046bc8a7b4c2fba22908025c59121c0ce2ce5bd9a45f1ed76023ff3eba06e5 \ + --hash=sha256:f8fd3faec0b0e7a18491bb87ccfce3389e1137ef54f356a4f7723d7f10f37dcf # via -r .nox/update_python_dependencies/tmp/uv.in diff --git a/tests/run_tests.sh b/tests/run_tests.sh index d93ff172..64a0e588 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -97,8 +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}" != "riscv64" ]; then - # no uv on musllinux s390x + if [ "${PYVERS}" != "3.6" ] && [ "${PYVERS}" != "3.7" ] && [ "${IMPLEMENTATION}" != "graalpy" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_ppc64le" ] && [ "${AUDITWHEEL_POLICY:0:9}_${AUDITWHEEL_ARCH}" != "musllinux_s390x" ] && [ "${AUDITWHEEL_ARCH}" != "riscv64" ]; then + # no uv on musllinux ppc64le / s390x 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}