From 1642ceef7cb622e530b30232536b31bb43ac7ed9 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Mon, 30 Oct 2017 16:29:04 +0100
Subject: Add libastra/linux-64 conda package variants for cudatoolkit

Also upgrade the Docker-based linux release scripts to match.
---
 python/conda/astra-toolbox/meta.yaml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'python/conda/astra-toolbox/meta.yaml')

diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml
index 942397e..f3a39be 100644
--- a/python/conda/astra-toolbox/meta.yaml
+++ b/python/conda/astra-toolbox/meta.yaml
@@ -9,13 +9,11 @@ source:
 build:
   number: 0
   script_env:
-    - CC # [not win]
-    - CUDA_ROOT # [not win]
+    - CC # [linux]
 
 test:
   imports:
     - astra
-
   requires:
     # To avoid large downloads just for testing after build phase
     - nomkl # [not win]
@@ -25,14 +23,14 @@ requirements:
     - python
     - cython >=0.13
     - nomkl # [not win]
-    - numpy
+    - numpy {{ numpy }}
     - scipy
     - six
     - libastra ==1.8
 
   run:
     - python
-    - numpy x.x
+    - {{ pin_compatible('numpy', max_pin='x.x') }}
     - scipy
     - six
     - libastra ==1.8
-- 
cgit v1.2.3