From f81f65166368993850de86a219ad8cbbbaa8cd33 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 4 Jun 2015 11:53:55 +0800 Subject: [PATCH] install-deps.sh: do not create "wheelhouse" unless it's ready * only create "wheelhouse" directory for tox when it is populated with all packages in *requiresments.txt. before than, the wheels are put in "wheelhouse-wip" Fixes: #11869 Signed-off-by: Kefu Chai --- install-deps.sh | 4 +++- src/ceph-detect-init/.gitignore | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 287152f74f9..e24b06e73ba 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -104,6 +104,7 @@ function get_pip_and_wheel() { mkdir -p install-deps-cache top_srcdir=$(pwd) export XDG_CACHE_HOME=$top_srcdir/install-deps-cache +wip_wheelhouse=wheelhouse-wip # # preload python modules so that tox can run without network access @@ -125,8 +126,9 @@ find . -name tox.ini | while read ini ; do for interpreter in python2.7 python3 ; do type $interpreter > /dev/null 2>&1 || continue . $top_srcdir/install-deps-$interpreter/bin/activate - get_pip_and_wheel wheel $require || exit 1 + get_pip_and_wheel "wheel -w $wip_wheelhouse" $require || exit 1 done + mv $wip_wheelhouse wheelhouse fi ) done diff --git a/src/ceph-detect-init/.gitignore b/src/ceph-detect-init/.gitignore index bcfa2815fb0..8c130b31665 100644 --- a/src/ceph-detect-init/.gitignore +++ b/src/ceph-detect-init/.gitignore @@ -7,7 +7,7 @@ *.egg dist build -wheelhouse +wheelhouse* *.log *.trs -- 2.47.3