summaryrefslogtreecommitdiffstats
path: root/python/conda/astra-toolbox
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2020-01-14 11:04:57 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2020-01-14 16:12:23 +0100
commit73e6231f1169a7f88ac9fcf078b2765723f5e842 (patch)
treebb4db71731689dabc54b1da51156b7fbf59774b6 /python/conda/astra-toolbox
parent06322245a638e435d29bc8f027aed0bd976139d0 (diff)
downloadastra-73e6231f1169a7f88ac9fcf078b2765723f5e842.tar.gz
astra-73e6231f1169a7f88ac9fcf078b2765723f5e842.tar.bz2
astra-73e6231f1169a7f88ac9fcf078b2765723f5e842.tar.xz
astra-73e6231f1169a7f88ac9fcf078b2765723f5e842.zip
Update python/numpy/cuda versions for conda
Diffstat (limited to 'python/conda/astra-toolbox')
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py27.yaml3
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py36.yaml3
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py37.yaml2
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py38.yaml (renamed from python/conda/astra-toolbox/conda_build_config_py35.yaml)7
4 files changed, 8 insertions, 7 deletions
diff --git a/python/conda/astra-toolbox/conda_build_config_py27.yaml b/python/conda/astra-toolbox/conda_build_config_py27.yaml
index 869d22e..d453378 100644
--- a/python/conda/astra-toolbox/conda_build_config_py27.yaml
+++ b/python/conda/astra-toolbox/conda_build_config_py27.yaml
@@ -3,9 +3,6 @@ python:
numpy:
- 1.11
- - 1.12
- - 1.13
- - 1.14
- 1.15
- 1.16
diff --git a/python/conda/astra-toolbox/conda_build_config_py36.yaml b/python/conda/astra-toolbox/conda_build_config_py36.yaml
index 996e22c..571a9e5 100644
--- a/python/conda/astra-toolbox/conda_build_config_py36.yaml
+++ b/python/conda/astra-toolbox/conda_build_config_py36.yaml
@@ -2,9 +2,10 @@ python:
- 3.6
numpy:
- - 1.14
+ - 1.11
- 1.15
- 1.16
+ - 1.17
c_compiler_version:
- 7.3
cxx_compiler_version:
diff --git a/python/conda/astra-toolbox/conda_build_config_py37.yaml b/python/conda/astra-toolbox/conda_build_config_py37.yaml
index 4282407..c654075 100644
--- a/python/conda/astra-toolbox/conda_build_config_py37.yaml
+++ b/python/conda/astra-toolbox/conda_build_config_py37.yaml
@@ -3,9 +3,9 @@ python:
numpy:
- 1.11
- - 1.14
- 1.15
- 1.16
+ - 1.17
c_compiler_version:
- 7.3
cxx_compiler_version:
diff --git a/python/conda/astra-toolbox/conda_build_config_py35.yaml b/python/conda/astra-toolbox/conda_build_config_py38.yaml
index 72d4cef..96934dd 100644
--- a/python/conda/astra-toolbox/conda_build_config_py35.yaml
+++ b/python/conda/astra-toolbox/conda_build_config_py38.yaml
@@ -1,8 +1,11 @@
python:
- - 3.5
+ - 3.8
numpy:
- - 1.15
+ - 1.11
+ - 1.13
+ - 1.14
+ - 1.17
c_compiler_version:
- 7.3
cxx_compiler_version: