From ed0ca70707439f44779ca7093461182d73db1a77 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 16 May 2018 19:41:52 +0800 Subject: [PATCH] install-deps: nuke wheelhouse if it's stale otherwise, if we update *requirements.txt, and the wheelhouse fails to offer the newly added dependency, the setup-virtualenv.sh will fail the build. Signed-off-by: Kefu Chai --- install-deps.sh | 7 +++++++ src/tools/setup-virtualenv.sh | 3 +++ 2 files changed, 10 insertions(+) diff --git a/install-deps.sh b/install-deps.sh index c72a64c6f5efe..7fd9d25099f2a 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -333,6 +333,12 @@ find . -name tox.ini | while read ini ; do ( cd $(dirname $ini) require=$(ls *requirements.txt 2>/dev/null | sed -e 's/^/-r /') + md5=wheelhouse/md5 + if test "$require"; then + if ! test -f $md5 || ! md5sum -c $md5 ; then + rm -rf wheelhouse + fi + fi if test "$require" && ! test -d wheelhouse ; then for interpreter in python2.7 python3 ; do type $interpreter > /dev/null 2>&1 || continue @@ -340,6 +346,7 @@ find . -name tox.ini | while read ini ; do populate_wheelhouse "wheel -w $wip_wheelhouse" $require || exit 1 done mv $wip_wheelhouse wheelhouse + md5sum *requirements.txt > $md5 fi ) done diff --git a/src/tools/setup-virtualenv.sh b/src/tools/setup-virtualenv.sh index 996c9cd7f3231..9fef726a21e85 100755 --- a/src/tools/setup-virtualenv.sh +++ b/src/tools/setup-virtualenv.sh @@ -86,5 +86,8 @@ fi pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1' if test -f requirements.txt ; then + if ! test -f wheelhouse/md5 || ! md5sum -c wheelhouse/md5 > /dev/null; then + NO_INDEX='' + fi pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt fi -- 2.39.5