Commit cab40e7e authored by Mathieu Hemery's avatar Mathieu Hemery

Merge branch 'develop' into feature/well_formed

parents 1e8f7a4c 909bc883
......@@ -117,7 +117,7 @@ test: biocham_debug
$(MAKE) refs
jupyter_tests: install_kernel
PATH=$(CURDIR):$(PATH) jupyter nbconvert --execute --stdout library/examples/cmsb_2017/sigmoids.ipynb > /dev/null
PATH=$(CURDIR):$(PATH) jupyter nbconvert --execute --stdout --to notebook library/examples/cmsb_2017/sigmoids.ipynb > /dev/null
# runs test unit %
test_%: biocham_debug
......
......@@ -43,7 +43,7 @@ then
release=$(lsb_release -sc)
if [[ $release == "xenial" || $release == "bionic" ]]
if [[ $release == "xenial" || $release == "bionic" || $release == "focal" ]]
then
sudo apt-get -qy install software-properties-common
sudo apt-add-repository -y ppa:swi-prolog/stable
......@@ -58,7 +58,7 @@ then
call_cleanup(
(
current_prolog_flag(version, Version),
Version >= 80003,
Version >= 80203,
halt(0)
),
halt(1)
......@@ -67,12 +67,12 @@ then
# Compiling swi-prolog from source, expecting that a newer version of
# swi-prolog should be packaged in the next releases of Ubuntu
sudo apt-get -qy install libreadline-dev libgmp-dev
if [[ ! -d swipl-8.0.3 ]]
if [[ ! -d swipl-8.2.4 ]]
then
curl -fsSLO http://www.swi-prolog.org/download/stable/src/swipl-8.0.3.tar.gz
tar -xf swipl-8.0.3.tar.gz
curl -fsSLO http://www.swi-prolog.org/download/stable/src/swipl-8.2.4.tar.gz
tar -xf swipl-8.2.4.tar.gz
fi
pushd swipl-8.0.3
pushd swipl-8.2.4
./configure
make
sudo make install
......
......@@ -144,6 +144,9 @@ patch_show_coverage :-
run_tests_and_halt :-
version(V1),
current_prolog_flag(version, V2),
format("Biocham v~w running on SWI-Prolog ~w~n", [V1, V2]),
run_tests_and_halt(all).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment