summaryrefslogtreecommitdiffstats
path: root/python/conda/astra-toolbox
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-04-12 11:07:48 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-04-12 15:17:41 +0200
commit6627f4ae2ce5262b2aafa39ea94c7dfd33fbc672 (patch)
treee0e3578e65cb0620b4cbee97c8aa5d34dccddf5f /python/conda/astra-toolbox
parent667a390d94ad3b3ee706f9598a707376d9604810 (diff)
downloadastra-6627f4ae2ce5262b2aafa39ea94c7dfd33fbc672.tar.gz
astra-6627f4ae2ce5262b2aafa39ea94c7dfd33fbc672.tar.bz2
astra-6627f4ae2ce5262b2aafa39ea94c7dfd33fbc672.tar.xz
astra-6627f4ae2ce5262b2aafa39ea94c7dfd33fbc672.zip
Update conda builds for cuda 10 and numpy 1.16
Diffstat (limited to 'python/conda/astra-toolbox')
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py27.yaml10
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py35.yaml (renamed from python/conda/astra-toolbox/conda_build_config.yaml)3
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py36.yaml8
-rw-r--r--python/conda/astra-toolbox/conda_build_config_py37.yaml8
4 files changed, 26 insertions, 3 deletions
diff --git a/python/conda/astra-toolbox/conda_build_config_py27.yaml b/python/conda/astra-toolbox/conda_build_config_py27.yaml
new file mode 100644
index 0000000..f119b61
--- /dev/null
+++ b/python/conda/astra-toolbox/conda_build_config_py27.yaml
@@ -0,0 +1,10 @@
+python:
+ - 2.7
+
+numpy:
+ - 1.11
+ - 1.12
+ - 1.13
+ - 1.14
+ - 1.15
+ - 1.16
diff --git a/python/conda/astra-toolbox/conda_build_config.yaml b/python/conda/astra-toolbox/conda_build_config_py35.yaml
index 62b3c76..e841047 100644
--- a/python/conda/astra-toolbox/conda_build_config.yaml
+++ b/python/conda/astra-toolbox/conda_build_config_py35.yaml
@@ -1,8 +1,5 @@
python:
- - 2.7
- 3.5
- - 3.6
- - 3.7
numpy:
- 1.11
diff --git a/python/conda/astra-toolbox/conda_build_config_py36.yaml b/python/conda/astra-toolbox/conda_build_config_py36.yaml
new file mode 100644
index 0000000..a582533
--- /dev/null
+++ b/python/conda/astra-toolbox/conda_build_config_py36.yaml
@@ -0,0 +1,8 @@
+python:
+ - 3.6
+
+numpy:
+ - 1.11
+ - 1.14
+ - 1.15
+ - 1.16
diff --git a/python/conda/astra-toolbox/conda_build_config_py37.yaml b/python/conda/astra-toolbox/conda_build_config_py37.yaml
new file mode 100644
index 0000000..ebbf44a
--- /dev/null
+++ b/python/conda/astra-toolbox/conda_build_config_py37.yaml
@@ -0,0 +1,8 @@
+python:
+ - 3.7
+
+numpy:
+ - 1.11
+ - 1.14
+ - 1.15
+ - 1.16