From 06e45f890046a9ae618c06009f60925e3d4e30b5 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Wed, 30 Sep 2020 14:25:16 +0200 Subject: [PATCH] tools(docker): Fix manylinux script --- tools/docker/build-manylinux1.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tools/docker/build-manylinux1.sh b/tools/docker/build-manylinux1.sh index 5b5838508a..9479698436 100755 --- a/tools/docker/build-manylinux1.sh +++ b/tools/docker/build-manylinux1.sh @@ -70,7 +70,6 @@ function export_manylinux_wheel { [[ -e "$FILE" ]] || continue #cp "$FILE" "${export_root}/${FILE%.whl}"_unfixed.whl auditwheel show "$FILE" - #/opt/_internal/cpython-3.7.8/bin/python -m auditwheel -v repair --plat manylinux2010_x86_64 "$FILE" -w "$export_root" auditwheel -v repair --plat manylinux2010_x86_64 "$FILE" -w "$export_root" done } @@ -141,12 +140,6 @@ TESTS=( ############################################################################### # Main -# Force the use of wheel 0.31.1 since 0.32 is broken -# cf pypa/auditwheel#102 -#/opt/_internal/cpython-3.6.6/bin/python -m pip install wheel==0.31.1 - -# Downgrade auditwheel -#/opt/_internal/cpython-3.7.8/bin/pip install auditwheel==2.0.0 mkdir -p "${BUILD_ROOT}" mkdir -p "${EXPORT_ROOT}" @@ -202,7 +195,7 @@ do # Save old hash and size, in order to look them up in RECORD # see: https://github.com/pypa/pip/blob/c9df690f3b5bb285a855953272e6fe24f69aa08a/src/pip/_internal/wheel.py#L71-L84 - WHEEL_HASH_CMD="/opt/_internal/cpython-3.7.8/bin/python3 -c \ + WHEEL_HASH_CMD="/opt/_internal/cpython-3.8.*/bin/python3 -c \ \"import hashlib;\ import base64;\ print(\