summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKulhanek <tomas.kulhanek@stfc.ac.uk>2019-01-28 13:05:35 +0000
committerKulhanek <tomas.kulhanek@stfc.ac.uk>2019-01-28 13:05:35 +0000
commite9afcd85fa33d644c89feb3dfd60f3ddf3ecbbeb (patch)
tree86885019fcadb943cbf68855642ae8459550b0db
parenta5bfbc29e1dca36cb36a1aaf44549cfd97efdb9d (diff)
parent38d1b956a72b858a996403e1305d16e24aca9c09 (diff)
downloadframework-e9afcd85fa33d644c89feb3dfd60f3ddf3ecbbeb.tar.gz
framework-e9afcd85fa33d644c89feb3dfd60f3ddf3ecbbeb.tar.bz2
framework-e9afcd85fa33d644c89feb3dfd60f3ddf3ecbbeb.tar.xz
framework-e9afcd85fa33d644c89feb3dfd60f3ddf3ecbbeb.zip
UPDATE
-rw-r--r--README.md2
-rw-r--r--Wrappers/Python/conda-recipe/conda_build_config.yaml3
2 files changed, 4 insertions, 1 deletions
diff --git a/README.md b/README.md
index 49714e8..c1133bd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
# CCPi-Framework
+[![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
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.
diff --git a/Wrappers/Python/conda-recipe/conda_build_config.yaml b/Wrappers/Python/conda-recipe/conda_build_config.yaml
index b7977f3..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, cvxp requires >1.14
+ #- 1.12
- 1.15