diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 17:30:28 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2017-11-22 17:30:28 +0100 |
| commit | 985057bb58bdb85a31fd883f2651fce9fb3fad16 (patch) | |
| tree | 69ad722aa934307adcd8cc9834d6437961b3215a /python/conda | |
| parent | a527cc9e29cae256bd095b032f34c80957e84907 (diff) | |
| parent | 231a6de483e94507de34bd2f79317d875bbb354b (diff) | |
| download | astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.gz astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.bz2 astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.tar.xz astra-985057bb58bdb85a31fd883f2651fce9fb3fad16.zip | |
Merge branch 'master' into parallel_vec
Diffstat (limited to 'python/conda')
| -rw-r--r-- | python/conda/astra-toolbox/meta.yaml | 8 | ||||
| -rw-r--r-- | python/conda/libastra/meta.yaml | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml index 88a9172..b68a093 100644 --- a/python/conda/astra-toolbox/meta.yaml +++ b/python/conda/astra-toolbox/meta.yaml @@ -1,10 +1,10 @@ package: name: astra-toolbox - version: '1.8.3' + version: '1.9.0dev' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - git_tag: v1.8.3 + git_tag: master build: number: 0 @@ -28,14 +28,14 @@ requirements: - numpy {{ numpy }} - scipy - six - - libastra ==1.8.3 + - libastra ==1.9.0dev run: - python - {{ pin_compatible('numpy', max_pin='x.x') }} - scipy - six - - libastra ==1.8.3 + - libastra ==1.9.0dev about: diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index e4622b7..2135376 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,10 +1,10 @@ package: name: libastra - version: '1.8.3' + version: '1.9.0dev' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - git_tag: v1.8.3 + git_tag: master build: number: 0 |