diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 16:41:34 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 16:41:34 +0100 |
| commit | a527cc9e29cae256bd095b032f34c80957e84907 (patch) | |
| tree | e68dd547d6a88c188eca4798423adf084ba58124 /python/conda/astra-toolbox/meta.yaml | |
| parent | 6a7b605102f1c22224b516906cb4a848cda50a3b (diff) | |
| parent | bd2798bed2fddfe00dac006013a9fb1363417f20 (diff) | |
| download | astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.gz astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.bz2 astra-a527cc9e29cae256bd095b032f34c80957e84907.tar.xz astra-a527cc9e29cae256bd095b032f34c80957e84907.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'python/conda/astra-toolbox/meta.yaml')
| -rw-r--r-- | python/conda/astra-toolbox/meta.yaml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml index 942397e..88a9172 100644 --- a/python/conda/astra-toolbox/meta.yaml +++ b/python/conda/astra-toolbox/meta.yaml @@ -1,41 +1,41 @@ package: name: astra-toolbox - version: '1.8' + version: '1.8.3' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - git_tag: v1.8 + git_tag: v1.8.3 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] + # import scipy.sparse.linalg fails with mkl-2017.0.4 on Windows + - mkl !=2017.0.4 # [win] requirements: build: - python - cython >=0.13 - nomkl # [not win] - - numpy + - numpy {{ numpy }} - scipy - six - - libastra ==1.8 + - libastra ==1.8.3 run: - python - - numpy x.x + - {{ pin_compatible('numpy', max_pin='x.x') }} - scipy - six - - libastra ==1.8 + - libastra ==1.8.3 about: |