diff --git a/.appveyor.yml b/.appveyor.yml index cc2eb1f..aa0b97c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -9,10 +9,7 @@ environment: secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 matrix: - - CONFIG: win_c_compilervs2008cxx_compilervs2008 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - - CONFIG: win_c_compilervs2015cxx_compilervs2015 + - CONFIG: win_c_compilervs2015cxx_compilervs2015vc14 CONDA_INSTALL_LOCN: C:\Miniconda36-x64 diff --git a/.ci_support/win_c_compilervs2008cxx_compilervs2008.yaml b/.ci_support/win_c_compilervs2008cxx_compilervs2008.yaml deleted file mode 100644 index fcc05f1..0000000 --- a/.ci_support/win_c_compilervs2008cxx_compilervs2008.yaml +++ /dev/null @@ -1,12 +0,0 @@ -c_compiler: -- vs2008 -cxx_compiler: -- vs2008 -pin_run_as_build: - zlib: - max_pin: x.x -zip_keys: -- - c_compiler - - cxx_compiler -zlib: -- '1.2' diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015vc14.yaml similarity index 70% rename from .ci_support/win_c_compilervs2015cxx_compilervs2015.yaml rename to .ci_support/win_c_compilervs2015cxx_compilervs2015vc14.yaml index 25957d2..7259692 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015vc14.yaml @@ -3,10 +3,15 @@ c_compiler: cxx_compiler: - vs2015 pin_run_as_build: + vc: + max_pin: x zlib: max_pin: x.x +vc: +- '14' zip_keys: -- - c_compiler +- - vc + - c_compiler - cxx_compiler zlib: - '1.2' diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d60a25d..047fdaf 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ Checklist * [ ] Used a fork of the feedstock to propose changes * [ ] Bumped the build number (if the version is unchanged) * [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` +* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) * [ ] Ensured the license file is being packaged.