From 6a49e7a7a0e23d95557aabb2f95ad490ea6d947b Mon Sep 17 00:00:00 2001 From: gongweibao Date: Tue, 28 Mar 2017 11:00:54 +0800 Subject: [PATCH 1/3] add timeout --- .tools/convert-markdown-into-ipynb-and-test.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.tools/convert-markdown-into-ipynb-and-test.sh b/.tools/convert-markdown-into-ipynb-and-test.sh index a038a2bc..9d1a589c 100755 --- a/.tools/convert-markdown-into-ipynb-and-test.sh +++ b/.tools/convert-markdown-into-ipynb-and-test.sh @@ -1,6 +1,6 @@ #!/bin/bash command -v go >/dev/null 2>&1 -if [ $? -ne 0 ]; then +if [[ $? -ne 0 ]]; then echo >&2 "Please install go https://golang.org/doc/install#install" exit 1 fi @@ -13,7 +13,7 @@ cd $cur_path/../ #convert md to ipynb for file in */{README,README\.en}.md ; do ~/go/bin/markdown-to-ipynb < $file > ${file%.*}".ipynb" - if [ $? -ne 0 ]; then + if [[ $? -ne 0 ]]; then echo >&2 "markdown-to-ipynb $file error" exit 1 fi @@ -29,7 +29,19 @@ for file in */{README,README\.en}.ipynb ; do cd $(dirname $file) > /dev/null echo "begin test $file" - jupyter nbconvert --to python $(basename $file) --stdout | python + if [[ $(dirname $file) == "08.recommender_system" ]]; then + timeout -s SIGKILL 30 bash -c \ + "jupyter nbconvert --to python $(basename $file) --stdout | \ + sed 's/get_ipython()\.magic(.*'\''matplotlib inline'\'')/\#matplotlib inline/g' | \ + sed '/^# coding: utf-8/a\import matplotlib\nmatplotlib.use('\''Agg'\'')' | python" + else + timeout -s SIGKILL 30 bash -c "jupyter nbconvert --to python $(basename $file) --stdout | python" + fi + + if [[ $? -ne 0 && $? -ne 124 && $? -ne 137 ]]; then + echo >&2 "exec $file error!" + exit 1 + fi popd > /dev/null #break From f0f5b2736c929e72d73375a38ebbccd7ee7611fe Mon Sep 17 00:00:00 2001 From: gongweibao Date: Tue, 28 Mar 2017 11:04:58 +0800 Subject: [PATCH 2/3] fix --- .tools/convert-markdown-into-ipynb-and-test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.tools/convert-markdown-into-ipynb-and-test.sh b/.tools/convert-markdown-into-ipynb-and-test.sh index 9d1a589c..c8bf2e26 100755 --- a/.tools/convert-markdown-into-ipynb-and-test.sh +++ b/.tools/convert-markdown-into-ipynb-and-test.sh @@ -46,3 +46,4 @@ for file in */{README,README\.en}.ipynb ; do popd > /dev/null #break done + From 63451294d53bb8a3b258340ba40528671114838c Mon Sep 17 00:00:00 2001 From: gongweibao Date: Tue, 28 Mar 2017 11:07:44 +0800 Subject: [PATCH 3/3] fix --- .tools/convert-markdown-into-ipynb-and-test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.tools/convert-markdown-into-ipynb-and-test.sh b/.tools/convert-markdown-into-ipynb-and-test.sh index c8bf2e26..9d1a589c 100755 --- a/.tools/convert-markdown-into-ipynb-and-test.sh +++ b/.tools/convert-markdown-into-ipynb-and-test.sh @@ -46,4 +46,3 @@ for file in */{README,README\.en}.ipynb ; do popd > /dev/null #break done -