From 20f82364390ed7a9cdd544ac2e9ad42779abbe70 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Wed, 15 Aug 2018 08:50:50 +0100
Subject: removed CIL_VERSION env variable from conda build
---
Wrappers/Python/conda-recipe/build.sh | 4 ----
Wrappers/Python/conda-recipe/meta.yaml | 6 +-----
2 files changed, 1 insertion(+), 9 deletions(-)
(limited to 'Wrappers/Python')
diff --git a/Wrappers/Python/conda-recipe/build.sh b/Wrappers/Python/conda-recipe/build.sh
index 2031342..54bc8e2 100644
--- a/Wrappers/Python/conda-recipe/build.sh
+++ b/Wrappers/Python/conda-recipe/build.sh
@@ -1,8 +1,4 @@
-if [ -z "$CIL_VERSION" ]; then
- echo "Need to set CIL_VERSION"
- exit 1
-fi
mkdir "$SRC_DIR/ccpi"
cp -rv "$RECIPE_DIR/../.." "$SRC_DIR/ccpi"
cp -rv "$RECIPE_DIR/../../../Core" "$SRC_DIR/Core"
diff --git a/Wrappers/Python/conda-recipe/meta.yaml b/Wrappers/Python/conda-recipe/meta.yaml
index 115fcf5..9286cc4 100644
--- a/Wrappers/Python/conda-recipe/meta.yaml
+++ b/Wrappers/Python/conda-recipe/meta.yaml
@@ -1,12 +1,10 @@
package:
name: ccpi-regulariser
- version: {{ environ['CIL_VERSION'] }}
+ version: 0.10.1
build:
preserve_egg_dir: False
- script_env:
- - CIL_VERSION
# number: 0
test:
@@ -21,7 +19,6 @@ requirements:
- numpy x.x
- setuptools
- cython
- # - cil_regulariser =={{ environ['CIL_VERSION'] }}
- vc 14 # [win and py36]
- vc 14 # [win and py35]
- vc 9 # [win and py27]
@@ -30,7 +27,6 @@ requirements:
run:
- python
- numpy x.x
- # - cil_regulariser =={{ environ['CIL_VERSION'] }}
- vc 14 # [win and py36]
- vc 14 # [win and py35]
- vc 9 # [win and py27]
--
cgit v1.2.3