From 5cf0bf6d32ccb422a77ea8c86a2379c870179c8b Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 14 Apr 2020 11:51:30 +1000 Subject: [PATCH] Revert "wheel-build : temporary pip with checksum output" This reverts commit 8b3532c562ddd644de86e0f0929d0b2d88631cfe. The change mentioned inline has been incoporated upstream with [1]. I don't think we've managed to replicate the corrupt wheel situation since. [1] https://github.com/pypa/pip/commit/0dbab23df903926de71b8e2ce08359a378327ad1 Change-Id: I58fa0a53939207427f286584e91e1c59d4863992 --- roles/build-wheels/files/wheel-build.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/roles/build-wheels/files/wheel-build.sh b/roles/build-wheels/files/wheel-build.sh index cc0c9d61ad..564b73749e 100755 --- a/roles/build-wheels/files/wheel-build.sh +++ b/roles/build-wheels/files/wheel-build.sh @@ -24,12 +24,7 @@ for BRANCH in master $BRANCHES; do rm -rf build_env virtualenv -p $PYTHON_VERSION build_env - # NOTE(ianw) 2018-10-22 This is a temporary hack to get some more - # info into the logs to debug corrupt wheels. We should see pip - # stamping sha256 hashes into the logs for each wheel, so we can - # see if the bad output is coming from pip, or somewhere else. - build_env/bin/pip install --upgrade --force-reinstall \ - 'git+https://github.com/ianw/pip.git@path-and-hash#egg=pip' + build_env/bin/pip install --upgrade pip # SHORT_BRANCH is just "master","newton","kilo" etc. because this # keeps the output log hierarchy much simpler.