From c3dd8812d3f4adc01d81555dbfee75eaef534318 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Sat, 26 May 2018 03:38:44 -0400 Subject: [PATCH] MNT: Re-rendered with conda-smithy 3.1.5 and pinning 2018.05.22 After revamping the recipe, re-render to update pinnings and compiler usage. --- .appveyor.yml | 2 +- .ci_support/linux_.yaml | 8 ++++++++ .ci_support/osx_.yaml | 8 ++++++++ .ci_support/win_.yaml | 5 ----- .ci_support/win_c_compilervs2015vc14.yaml | 20 ++++++++++++++++++++ 5 files changed, 37 insertions(+), 6 deletions(-) delete mode 100644 .ci_support/win_.yaml create mode 100644 .ci_support/win_c_compilervs2015vc14.yaml diff --git a/.appveyor.yml b/.appveyor.yml index 4597130..6b55eb2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,7 +9,7 @@ environment: secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4 matrix: - - CONFIG: win_ + - CONFIG: win_c_compilervs2015vc14 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 diff --git a/.ci_support/linux_.yaml b/.ci_support/linux_.yaml index a52ae30..1e9a16f 100644 --- a/.ci_support/linux_.yaml +++ b/.ci_support/linux_.yaml @@ -1,5 +1,13 @@ +c_compiler: +- toolchain_c curl: - '7.59' +fortran_compiler: +- toolchain_fort +perl: +- '5.26' pin_run_as_build: curl: max_pin: x + perl: + max_pin: x.x diff --git a/.ci_support/osx_.yaml b/.ci_support/osx_.yaml index 9264ac0..df2099e 100644 --- a/.ci_support/osx_.yaml +++ b/.ci_support/osx_.yaml @@ -1,11 +1,19 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +c_compiler: +- toolchain_c curl: - '7.59' +fortran_compiler: +- toolchain_fort macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.9' +perl: +- '5.26' pin_run_as_build: curl: max_pin: x + perl: + max_pin: x.x diff --git a/.ci_support/win_.yaml b/.ci_support/win_.yaml deleted file mode 100644 index a52ae30..0000000 --- a/.ci_support/win_.yaml +++ /dev/null @@ -1,5 +0,0 @@ -curl: -- '7.59' -pin_run_as_build: - curl: - max_pin: x diff --git a/.ci_support/win_c_compilervs2015vc14.yaml b/.ci_support/win_c_compilervs2015vc14.yaml new file mode 100644 index 0000000..90f37c7 --- /dev/null +++ b/.ci_support/win_c_compilervs2015vc14.yaml @@ -0,0 +1,20 @@ +c_compiler: +- vs2015 +curl: +- '7.59' +fortran_compiler: +- gfortran +perl: +- '5.26' +pin_run_as_build: + curl: + max_pin: x + perl: + max_pin: x.x + vc: + max_pin: x +vc: +- '14' +zip_keys: +- - vc + - c_compiler