From a21530d181abb8e8d84d66dc05e14477665a6d66 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sat, 14 Jul 2018 20:51:10 +0000 Subject: [PATCH] MNT: Re-rendered with conda-smithy 3.1.6 and pinning 2018.07.01 --- .appveyor.yml | 6 +++--- .ci_support/linux_python2.7.yaml | 4 ++++ .ci_support/linux_python3.5.yaml | 4 ++++ .ci_support/linux_python3.6.yaml | 4 ++++ .ci_support/osx_python2.7.yaml | 4 ++++ .ci_support/osx_python3.5.yaml | 4 ++++ .ci_support/osx_python3.6.yaml | 4 ++++ ..._compilervs2008cxx_compilervs2008python2.7.yaml | 14 ++++++++++++++ ..._compilervs2015cxx_compilervs2015python3.5.yaml | 14 ++++++++++++++ ..._compilervs2015cxx_compilervs2015python3.6.yaml | 14 ++++++++++++++ .ci_support/win_python2.7.yaml | 6 ------ .ci_support/win_python3.5.yaml | 6 ------ .ci_support/win_python3.6.yaml | 6 ------ 13 files changed, 69 insertions(+), 21 deletions(-) create mode 100644 .ci_support/win_c_compilervs2008cxx_compilervs2008python2.7.yaml create mode 100644 .ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml create mode 100644 .ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml delete mode 100644 .ci_support/win_python2.7.yaml delete mode 100644 .ci_support/win_python3.5.yaml delete mode 100644 .ci_support/win_python3.6.yaml diff --git a/.appveyor.yml b/.appveyor.yml index c138c08..7aaffe1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,13 +9,13 @@ environment: secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 matrix: - - CONFIG: win_python2.7 + - CONFIG: win_c_compilervs2008cxx_compilervs2008python2.7 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - CONFIG: win_python3.5 + - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.5 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - CONFIG: win_python3.6 + - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml index dca2267..a05acb7 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,3 +1,7 @@ +c_compiler: +- toolchain_c +cxx_compiler: +- toolchain_cxx pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml index d43136c..7b98937 100644 --- a/.ci_support/linux_python3.5.yaml +++ b/.ci_support/linux_python3.5.yaml @@ -1,3 +1,7 @@ +c_compiler: +- toolchain_c +cxx_compiler: +- toolchain_cxx pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index ce1d020..c47e726 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,3 +1,7 @@ +c_compiler: +- toolchain_c +cxx_compiler: +- toolchain_cxx pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml index fa4444c..24328d6 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -1,5 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +c_compiler: +- toolchain_c +cxx_compiler: +- toolchain_cxx macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_python3.5.yaml index d6d7339..12504e8 100644 --- a/.ci_support/osx_python3.5.yaml +++ b/.ci_support/osx_python3.5.yaml @@ -1,5 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +c_compiler: +- toolchain_c +cxx_compiler: +- toolchain_cxx macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index 3d612fe..33ee257 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -1,5 +1,9 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' +c_compiler: +- toolchain_c +cxx_compiler: +- toolchain_cxx macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: diff --git a/.ci_support/win_c_compilervs2008cxx_compilervs2008python2.7.yaml b/.ci_support/win_c_compilervs2008cxx_compilervs2008python2.7.yaml new file mode 100644 index 0000000..41251f0 --- /dev/null +++ b/.ci_support/win_c_compilervs2008cxx_compilervs2008python2.7.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2008 +cxx_compiler: +- vs2008 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '2.7' +zip_keys: +- - python + - c_compiler + - cxx_compiler diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml new file mode 100644 index 0000000..64b4cc3 --- /dev/null +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.5.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2015 +cxx_compiler: +- vs2015 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.5' +zip_keys: +- - python + - c_compiler + - cxx_compiler diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml new file mode 100644 index 0000000..e97d6c4 --- /dev/null +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6.yaml @@ -0,0 +1,14 @@ +c_compiler: +- vs2015 +cxx_compiler: +- vs2015 +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.6' +zip_keys: +- - python + - c_compiler + - cxx_compiler diff --git a/.ci_support/win_python2.7.yaml b/.ci_support/win_python2.7.yaml deleted file mode 100644 index dca2267..0000000 --- a/.ci_support/win_python2.7.yaml +++ /dev/null @@ -1,6 +0,0 @@ -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '2.7' diff --git a/.ci_support/win_python3.5.yaml b/.ci_support/win_python3.5.yaml deleted file mode 100644 index d43136c..0000000 --- a/.ci_support/win_python3.5.yaml +++ /dev/null @@ -1,6 +0,0 @@ -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.5' diff --git a/.ci_support/win_python3.6.yaml b/.ci_support/win_python3.6.yaml deleted file mode 100644 index ce1d020..0000000 --- a/.ci_support/win_python3.6.yaml +++ /dev/null @@ -1,6 +0,0 @@ -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.6'