diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2019-09-25 13:55:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:55:23 +0200 |
| commit | 1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3 (patch) | |
| tree | d326f7936b3dec5c0d61349047516a67127da7a6 /python/conda/astra-toolbox | |
| parent | 6e9fb3ec670863b62006288cd8bba5b773530a53 (diff) | |
| parent | d621b2ceed23f4ecc945b00ffd6e859b70b89b50 (diff) | |
| download | astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.tar.gz astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.tar.bz2 astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.tar.xz astra-1fec36f7ccadd5f7dcf2bb59b0654dc53653b0f3.zip | |
Merge pull request #214 from ahendriksen/CI-use-conda-c-compiler-toolchain
Use conda compiler toolchain for conda builds
Diffstat (limited to 'python/conda/astra-toolbox')
5 files changed, 22 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 index f119b61..869d22e 100644 --- a/python/conda/astra-toolbox/conda_build_config_py27.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py27.yaml @@ -8,3 +8,8 @@ numpy: - 1.14 - 1.15 - 1.16 + +c_compiler_version: + - 7.3 +cxx_compiler_version: + - 7.3 diff --git a/python/conda/astra-toolbox/conda_build_config_py35.yaml b/python/conda/astra-toolbox/conda_build_config_py35.yaml index 8dd963c..72d4cef 100644 --- a/python/conda/astra-toolbox/conda_build_config_py35.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py35.yaml @@ -3,3 +3,7 @@ python: numpy: - 1.15 +c_compiler_version: + - 7.3 +cxx_compiler_version: + - 7.3 diff --git a/python/conda/astra-toolbox/conda_build_config_py36.yaml b/python/conda/astra-toolbox/conda_build_config_py36.yaml index f043435..996e22c 100644 --- a/python/conda/astra-toolbox/conda_build_config_py36.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py36.yaml @@ -5,3 +5,7 @@ numpy: - 1.14 - 1.15 - 1.16 +c_compiler_version: + - 7.3 +cxx_compiler_version: + - 7.3 diff --git a/python/conda/astra-toolbox/conda_build_config_py37.yaml b/python/conda/astra-toolbox/conda_build_config_py37.yaml index ebbf44a..4282407 100644 --- a/python/conda/astra-toolbox/conda_build_config_py37.yaml +++ b/python/conda/astra-toolbox/conda_build_config_py37.yaml @@ -6,3 +6,7 @@ numpy: - 1.14 - 1.15 - 1.16 +c_compiler_version: + - 7.3 +cxx_compiler_version: + - 7.3 diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml index 054751b..b3c036b 100644 --- a/python/conda/astra-toolbox/meta.yaml +++ b/python/conda/astra-toolbox/meta.yaml @@ -8,8 +8,7 @@ source: build: number: 0 - script_env: - - CC # [linux] + string: py_{{ python }}_numpy_{{ numpy }} test: imports: @@ -24,14 +23,17 @@ test: requirements: build: + - {{ compiler('c') }} # [win or linux] + - {{ compiler('cxx') }} # [linux] + host: - python - cython >=0.13 + - boost # [osx or linux] - nomkl # [not win] - numpy {{ numpy }} - scipy - six - libastra ==1.9.0.dev11 - run: - python - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }} |