From ece0bfc45cf2e339fc517a4f2c078f0b8fe274ad Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Mon, 23 Oct 2017 17:04:41 +0100
Subject: add fista-recipe and stuff
---
src/Python/fista-recipe/build.sh | 10 ++++++++++
src/Python/fista-recipe/meta.yaml | 28 ++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
create mode 100644 src/Python/fista-recipe/build.sh
create mode 100644 src/Python/fista-recipe/meta.yaml
(limited to 'src/Python/fista-recipe')
diff --git a/src/Python/fista-recipe/build.sh b/src/Python/fista-recipe/build.sh
new file mode 100644
index 0000000..e3f3552
--- /dev/null
+++ b/src/Python/fista-recipe/build.sh
@@ -0,0 +1,10 @@
+if [ -z "$CIL_VERSION" ]; then
+ echo "Need to set CIL_VERSION"
+ exit 1
+fi
+mkdir "$SRC_DIR/ccpifista"
+cp -r "$RECIPE_DIR/.." "$SRC_DIR/ccpifista"
+
+cd $SRC_DIR/ccpifista
+
+$PYTHON setup-fista.py install
diff --git a/src/Python/fista-recipe/meta.yaml b/src/Python/fista-recipe/meta.yaml
new file mode 100644
index 0000000..64c9b5d
--- /dev/null
+++ b/src/Python/fista-recipe/meta.yaml
@@ -0,0 +1,28 @@
+package:
+ name: ccpi-fista
+ version: {{ environ['CIL_VERSION'] }}
+
+
+build:
+ preserve_egg_dir: False
+ script_env:
+ - CIL_VERSION
+# number: 0
+
+requirements:
+ build:
+ - python
+ - numpy
+ - setuptools
+
+ run:
+ - python
+ - numpy
+ - astra
+
+
+
+about:
+ home: http://www.ccpi.ac.uk
+ license: Apache v.2.0 license
+ summary: 'CCPi Core Imaging Library (Viewer)'
--
cgit v1.2.3
From 4fd4f187a70c0e4f56d5194b09ab4a528d20ee51 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Tue, 24 Oct 2017 10:38:37 +0100
Subject: Builds 2 packages fista and regularizers
---
src/Python/fista-recipe/meta.yaml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'src/Python/fista-recipe')
diff --git a/src/Python/fista-recipe/meta.yaml b/src/Python/fista-recipe/meta.yaml
index 64c9b5d..89bf597 100644
--- a/src/Python/fista-recipe/meta.yaml
+++ b/src/Python/fista-recipe/meta.yaml
@@ -18,7 +18,8 @@ requirements:
run:
- python
- numpy
- - astra
+ - astra-toolbox
+ - ccpi-regularizers
--
cgit v1.2.3
From ac4408e8984be8ca23a46b2b75bb243a0a4720aa Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Tue, 24 Oct 2017 13:00:23 +0100
Subject: Remove dependency on astra-toolbox in meta.yaml
this just because otherwise conda wants to install a version from astra-toolbox which I'm not sure works for us.
---
src/Python/fista-recipe/meta.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/Python/fista-recipe')
diff --git a/src/Python/fista-recipe/meta.yaml b/src/Python/fista-recipe/meta.yaml
index 89bf597..265541f 100644
--- a/src/Python/fista-recipe/meta.yaml
+++ b/src/Python/fista-recipe/meta.yaml
@@ -18,7 +18,7 @@ requirements:
run:
- python
- numpy
- - astra-toolbox
+ #- astra-toolbox
- ccpi-regularizers
--
cgit v1.2.3