From eeffd2d9748b8912b384a5764b808f5bfc850ade Mon Sep 17 00:00:00 2001 From: Holger Kohr Date: Wed, 23 Nov 2016 10:21:55 +0100 Subject: Separate C++ and python builds & make conda work nicely - make builder (= advanced user or us ourselves) choose compilers and CUDA - add a check for the C++11 flag for nvcc to work around the infamous boost bug if necessary - use conda boost to build the C++ library - simplify python bindings conda recipe to only build the bindings; the C++ library is now a build and runtime dependency - add runtime dependencies to python bindings recipe - some small adjustments to builder.py --- python/conda/libastra/meta.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'python/conda/libastra/meta.yaml') diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 73fa0d7..7c92e04 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -4,13 +4,19 @@ package: source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - #git_tag: v1.7.1 # Change to 1.8 after release + git_rev: master # for testing + # git_tag: 1.8 # TODO: change to this for next release build: number: 0 script_env: + - CC + - CXX - CUDA_ROOT - - MAKEOPTS + +requirements: + build: + - boost about: home: http://www.astra-toolbox.com -- cgit v1.2.3 From 93d14a3424d4bdc980eeab3f02e250c07e6c37b6 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 28 Nov 2016 16:37:53 +0100 Subject: Add conda build scripts for win-64/py35 --- python/conda/libastra/meta.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'python/conda/libastra/meta.yaml') diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 7c92e04..c9135ab 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -10,13 +10,17 @@ source: build: number: 0 script_env: - - CC - - CXX - - CUDA_ROOT + - CC # [not win] + - CXX # [not win] + - CUDA_ROOT # [not win] requirements: build: - - boost + - boost ==1.61 # [win] + - vs2015_runtime # [win] + + run: + - vs2015_runtime # [win] about: home: http://www.astra-toolbox.com -- cgit v1.2.3 From 7017618690b66e99773355b82afe26ac869d6aa8 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 28 Nov 2016 15:34:50 +0100 Subject: Add astra.__version__ (PEP396) --- python/conda/libastra/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'python/conda/libastra/meta.yaml') diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index c9135ab..25da269 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,6 +1,6 @@ package: name: libastra - version: '1.8b' + version: '1.8rc1' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git -- cgit v1.2.3 From 77f2cedaac088da5107dcfb37ae62d8f3a56f335 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 5 Dec 2016 14:44:09 +0100 Subject: Update version to 1.8 --- python/conda/libastra/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'python/conda/libastra/meta.yaml') diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 25da269..007cba9 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,11 +1,10 @@ package: name: libastra - version: '1.8rc1' + version: '1.8' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git - git_rev: master # for testing - # git_tag: 1.8 # TODO: change to this for next release + git_tag: v1.8 build: number: 0 -- cgit v1.2.3 From 3d080e9bd80714c65818feb31cdba131b36b6a3b Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 9 Dec 2016 15:39:57 +0100 Subject: Use external boost for conda/win-64 This enables py27 conda packages for win-64. --- python/conda/libastra/meta.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'python/conda/libastra/meta.yaml') diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 007cba9..c05a466 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -15,7 +15,6 @@ build: requirements: build: - - boost ==1.61 # [win] - vs2015_runtime # [win] run: -- cgit v1.2.3 From d70274581443afd30d8347dae737c419142c88da Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Mon, 23 Jan 2017 14:13:53 +0100 Subject: Add autotools and boost to macOS conda libastra dependencies --- python/conda/libastra/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'python/conda/libastra/meta.yaml') diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index c05a466..68cf47a 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -16,6 +16,10 @@ build: requirements: build: - vs2015_runtime # [win] + - boost # [osx] + - automake # [osx] + - autoconf # [osx] + - libtool # [osx] run: - vs2015_runtime # [win] -- cgit v1.2.3