summaryrefslogtreecommitdiffstats
path: root/python/conda/astra-toolbox/meta.yaml
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-06 14:03:18 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2017-11-06 14:40:24 +0100
commit4637704745849cf60ab951f941d5b81fd6fe55dc (patch)
tree1b52b7ec76676c1f7356377b5e1d6fec5c07c6fa /python/conda/astra-toolbox/meta.yaml
parent1642ceef7cb622e530b30232536b31bb43ac7ed9 (diff)
downloadastra-4637704745849cf60ab951f941d5b81fd6fe55dc.tar.gz
astra-4637704745849cf60ab951f941d5b81fd6fe55dc.tar.bz2
astra-4637704745849cf60ab951f941d5b81fd6fe55dc.tar.xz
astra-4637704745849cf60ab951f941d5b81fd6fe55dc.zip
Add workaround for apparently broken mkl/win-64 conda package
Diffstat (limited to 'python/conda/astra-toolbox/meta.yaml')
-rw-r--r--python/conda/astra-toolbox/meta.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml
index f3a39be..2b25c44 100644
--- a/python/conda/astra-toolbox/meta.yaml
+++ b/python/conda/astra-toolbox/meta.yaml
@@ -17,6 +17,8 @@ test:
requires:
# To avoid large downloads just for testing after build phase
- nomkl # [not win]
+ # import scipy.sparse.linalg fails with mkl-2017.0.4 on Windows
+ - mkl !=2017.0.4 # [win]
requirements:
build: