From 5fc7abb8688dae095d0c8274ae5679c44a9f4149 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 12:04:10 +0000 Subject: Update jenkins-build.sh --- build/jenkins-build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index 31b81d2..f1b9ad3 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash + +# define CIL_VERSION if not defined by calling environment if [[ -n ${CIL_VERSION} ]] then echo Using defined version: $CIL_VERSION @@ -6,12 +8,10 @@ else export CIL_VERSION=0.10.4 echo Defining version: $CIL_VERSION fi -# Script to builds source code in Jenkins environment -# module try-load conda -# install miniconda if the module is not present +# install miniconda if it is not already present if hash conda 2>/dev/null; then - echo using conda + echo using preinstalled conda else if [ ! -f Miniconda3-latest-Linux-x86_64.sh ]; then wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -- cgit v1.2.3 From 1cb5c41410d2c0db25849290fe7eeb5e960f053d Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:01:43 +0000 Subject: Update jenkins-build.sh --- build/jenkins-build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jenkins-build.sh b/build/jenkins-build.sh index f1b9ad3..dcdf3da 100644 --- a/build/jenkins-build.sh +++ b/build/jenkins-build.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash # define CIL_VERSION if not defined by calling environment -if [[ -n ${CIL_VERSION} ]] -then +if [[ -n ${CIL_VERSION} ]]; then echo Using defined version: $CIL_VERSION else export CIL_VERSION=0.10.4 @@ -13,6 +12,7 @@ fi if hash conda 2>/dev/null; then echo using preinstalled conda else + echo installing miniconda if [ ! -f Miniconda3-latest-Linux-x86_64.sh ]; then wget -q https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh chmod +x Miniconda3-latest-Linux-x86_64.sh @@ -22,7 +22,7 @@ else fi # presume that git clone is done before this script is launched, if not, uncomment -# git clone https://github.com/vais-ral/CCPi-Regularisation-Toolkit +# git clone https://github.com/vais-ral/CCPi-Framework.git conda install -y conda-build # need to call first build -- cgit v1.2.3 From 4f28f9195c1c7b56f679410ae41a7627d4bb6382 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:08:21 +0000 Subject: Update conda_build_config.yaml --- Wrappers/Python/conda-recipe/conda_build_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index b7977f3..7afbb0f 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -4,4 +4,4 @@ python: - 3.6 numpy: - 1.12 - - 1.15 + # doesn't build with - 1.15 -- cgit v1.2.3 From 10551e618a601480727798ddded8feeda844e327 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:19:17 +0000 Subject: Update conda_build_config.yaml --- Wrappers/Python/conda-recipe/conda_build_config.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml index 7afbb0f..0706479 100644 --- a/Wrappers/Python/conda-recipe/conda_build_config.yaml +++ b/Wrappers/Python/conda-recipe/conda_build_config.yaml @@ -3,5 +3,6 @@ python: - 3.5 - 3.6 numpy: - - 1.12 - # doesn't build with - 1.15 + # doesn't build with, cvxp requires >1.14 + #- 1.12 + - 1.15 -- cgit v1.2.3 From 1fe2b12b9f398ce045ebd7d319ea2d2fbd7f5e45 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:35:33 +0000 Subject: Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 49714e8..d6a2d64 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # CCPi-Framework +Last commit: [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) Basic Python Framework for CIL This package aims at ensuring a longer life and easy extensibility of the CIL software. This package provides a common framework, hence the name, for the analysis of data in the CT pipeline and quick development of novel reconstruction algorithms. -- cgit v1.2.3 From 4dfec332eaf26ec3d015475e3f3dc6950b8c204f Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:36:03 +0000 Subject: Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d6a2d64..3c86f00 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # CCPi-Framework -Last commit: [![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) +[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) + Basic Python Framework for CIL This package aims at ensuring a longer life and easy extensibility of the CIL software. This package provides a common framework, hence the name, for the analysis of data in the CT pipeline and quick development of novel reconstruction algorithms. -- cgit v1.2.3 From 38d1b956a72b858a996403e1305d16e24aca9c09 Mon Sep 17 00:00:00 2001 From: Tomas Kulhanek Date: Fri, 18 Jan 2019 13:37:35 +0000 Subject: Update README.md ADD: build status from jenkins embeddable build status plugin --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c86f00..c1133bd 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # CCPi-Framework -[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework&build=6)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/CCPi-Framework/6/) +[![Build Status](https://anvil.softeng-support.ac.uk/jenkins/buildStatus/icon?job=CILsingle/CCPi-Framework)](https://anvil.softeng-support.ac.uk/jenkins/job/CILsingle/job/CCPi-Framework/) Basic Python Framework for CIL -- cgit v1.2.3