From 75d4a522894c04a66062e1685b0e97d4a0e8340b Mon Sep 17 00:00:00 2001 From: nolash Date: Wed, 30 Jun 2021 23:50:47 +0200 Subject: [PATCH] Terminale requirement compile on errors --- apps/contract-migration/requirements.txt | 7 +++---- apps/util/requirements/compile.sh | 12 ++++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/contract-migration/requirements.txt b/apps/contract-migration/requirements.txt index 291ced7a..9c2202e8 100644 --- a/apps/contract-migration/requirements.txt +++ b/apps/contract-migration/requirements.txt @@ -1,4 +1,3 @@ - cic-base[full_graph]==0.1.2b15 - sarafu-faucet==0.0.3a3 - sarafu-token==0.0.1a8 - cic-eth==0.11.0b16 +sarafu-faucet==0.0.3a3 +sarafu-token==0.0.1a8 +cic-eth==0.11.0b16 diff --git a/apps/util/requirements/compile.sh b/apps/util/requirements/compile.sh index c88c2945..180e8005 100644 --- a/apps/util/requirements/compile.sh +++ b/apps/util/requirements/compile.sh @@ -13,19 +13,27 @@ out=$(mktemp) >&2 echo using tmp $t cat ../../requirements.txt > $out -repos=(../../cic-cache ../../cic-eth ../../cic-ussd ../../data-seeding ../../cic-notify) +repos=(../../cic-cache ../../cic-eth ../../cic-ussd ../../data-seeding ../../cic-notify ../../contract-migration) for r in ${repos[@]}; do f="$r/requirements.txt" >&2 echo updating $f pyreq-merge $f $out -vv > $in + if [ $? -gt 0 ]; then + >&2 echo requirement prepare failed for $f + exit 1 + fi cp $in $out f="$r/test_requirements.txt" if [ -f $f ]; then >&2 echo updating $f pyreq-merge $f $out -vv > $in + if [ $? -gt 0 ]; then + >&2 echo requirement prepare failed for $f + exit 1 + fi cp $in $out fi done @@ -41,7 +49,7 @@ for r in ${repos[@]}; do mkdir -vp $outd/$d echo "-r $f" > $outd/$d/$b_in pyreq-update -v $f compiled_requirements.txt >> $outd/$d/$b_in - pip-compile -v --extra-index-url $PIP_INDEX_URL $outd/$d/$b_in -o $outd/$d/$b + pip-compile --pre -v --extra-index-url $PIP_INDEX_URL $outd/$d/$b_in -o $outd/$d/$b if [ $? -gt 0 ]; then >&2 echo requirement compile failed for $f exit 1