MNT: Re-rendered with conda-build 3.18.2, conda-smithy 3.3.4, and con…

…da-forge-pinning 2019.05.29

.appveyor.yml

@@ -10,10 +10,7 @@ environment:
     secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1
 
   matrix:
-    - CONFIG: win_boost_version1.68.0c_compilervs2015cxx_compilervs2015vc14
-      CONDA_INSTALL_LOCN: C:\Miniconda36-x64
-
-    - CONFIG: win_boost_version1.69.0c_compilervs2015cxx_compilervs2015vc14
+    - CONFIG: win_c_compilervs2015cxx_compilervs2015vc14
       CONDA_INSTALL_LOCN: C:\Miniconda36-x64
 
 

.azure-pipelines/azure-pipelines-linux.yml

@@ -10,11 +10,8 @@ jobs:
   strategy:
     maxParallel: 8
     matrix:
-      linux_boost_version1.68.0:
-        CONFIG: linux_boost_version1.68.0
-        UPLOAD_PACKAGES: True
-      linux_boost_version1.69.0:
-        CONFIG: linux_boost_version1.69.0
+      linux_:
+        CONFIG: linux_
         UPLOAD_PACKAGES: True
   steps:
   - script: |

.azure-pipelines/azure-pipelines-osx.yml

@@ -10,11 +10,8 @@ jobs:
   strategy:
     maxParallel: 8
     matrix:
-      osx_boost_version1.68.0:
-        CONFIG: osx_boost_version1.68.0
-        UPLOAD_PACKAGES: True
-      osx_boost_version1.69.0:
-        CONFIG: osx_boost_version1.69.0
+      osx_:
+        CONFIG: osx_
         UPLOAD_PACKAGES: True
 
   steps:

.azure-pipelines/azure-pipelines-win.yml

@@ -10,12 +10,8 @@ jobs:
   strategy:
     maxParallel: 4
     matrix:
-      win_boost_version1.68.0c_compilervs2015cxx_compilervs2015vc14:
-        CONFIG: win_boost_version1.68.0c_compilervs2015cxx_compilervs2015vc14
-        CONDA_BLD_PATH: D:\\bld\\
-        UPLOAD_PACKAGES: False
-      win_boost_version1.69.0c_compilervs2015cxx_compilervs2015vc14:
-        CONFIG: win_boost_version1.69.0c_compilervs2015cxx_compilervs2015vc14
+      win_c_compilervs2015cxx_compilervs2015vc14:
+        CONFIG: win_c_compilervs2015cxx_compilervs2015vc14
         CONDA_BLD_PATH: D:\\bld\\
         UPLOAD_PACKAGES: False
   steps:

.azure-pipelines/run_docker_build.sh

@@ -5,7 +5,7 @@
 # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also
 # benefit from the improvement.
 
-set -xeuo pipefail
+set -xeo pipefail
 
 THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
 PROVIDER_DIR="$(basename $THISDIR)"
@@ -28,12 +28,25 @@ fi
 ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"
 
 if [ -z "$CONFIG" ]; then
-    echo "Need to set CONFIG env variable"
+    set +x
+    FILES=`ls .ci_support/linux_*`
+    CONFIGS=""
+    for file in $FILES; do
+        CONFIGS="${CONFIGS}'${file:12:-5}' or ";
+    done
+    echo "Need to set CONFIG env variable. Value can be one of ${CONFIGS:0:-4}"
     exit 1
 fi
 
-pip install shyaml
-DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )
+if [ -z "${DOCKER_IMAGE}" ]; then
+    SHYAML_INSTALLED="$(shyaml --version || echo NO)"
+    if [ "${SHYAML_INSTALLED}" == "NO" ]; then
+        echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7"
+        DOCKER_IMAGE="condaforge/linux-anvil-comp7"
+    else
+        DOCKER_IMAGE="$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )"
+    fi
+fi
 
 mkdir -p "$ARTIFACTS"
 DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"

.ci_support/linux_boost_version1.68.0.yaml → .ci_support/linux_.yaml

@@ -1,7 +1,5 @@
 boost:
-- 1.68.0
-boost_version:
-- 1.68.0
+- 1.70.0
 c_compiler:
 - gcc
 c_compiler_version:

.ci_support/osx_boost_version1.68.0.yaml → .ci_support/osx_.yaml

@@ -1,9 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 boost:
-- 1.68.0
-boost_version:
-- 1.68.0
+- 1.70.0
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/win_boost_version1.68.0c_compilervs2015cxx_compilervs2015vc14.yaml → .ci_support/win_c_compilervs2015cxx_compilervs2015vc14.yaml

@@ -1,7 +1,7 @@
+CMAKE_GENERATOR:
+- NMake Makefiles
 boost:
-- 1.68.0
-boost_version:
-- 1.68.0
+- 1.70.0
 c_compiler:
 - vs2015
 channel_sources:

README.md

@@ -36,45 +36,24 @@ Current build status
         <table>
           <thead><tr><th>Variant</th><th>Status</th></tr></thead>
           <tbody><tr>
-              <td>linux_boost_version1.68.0</td>
+              <td>linux</td>
               <td>
                 <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6423&branchName=master">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=linux&configuration=linux_boost_version1.68.0" alt="variant">
+                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=linux&configuration=linux_" alt="variant">
                 </a>
               </td>
             </tr><tr>
-              <td>linux_boost_version1.69.0</td>
+              <td>osx</td>
               <td>
                 <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6423&branchName=master">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=linux&configuration=linux_boost_version1.69.0" alt="variant">
+                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=osx&configuration=osx_" alt="variant">
                 </a>
               </td>
             </tr><tr>
-              <td>osx_boost_version1.68.0</td>
+              <td>win_c_compilervs2015cxx_compilervs2015vc14</td>
               <td>
                 <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6423&branchName=master">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=osx&configuration=osx_boost_version1.68.0" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>osx_boost_version1.69.0</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6423&branchName=master">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=osx&configuration=osx_boost_version1.69.0" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>win_boost_version1.68.0c_compilervs2015cxx_compilervs2015vc14</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6423&branchName=master">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=win&configuration=win_boost_version1.68.0c_compilervs2015cxx_compilervs2015vc14" alt="variant">
-                </a>
-              </td>
-            </tr><tr>
-              <td>win_boost_version1.69.0c_compilervs2015cxx_compilervs2015vc14</td>
-              <td>
-                <a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=6423&branchName=master">
-                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=win&configuration=win_boost_version1.69.0c_compilervs2015cxx_compilervs2015vc14" alt="variant">
+                  <img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/cgal-cpp-feedstock?branchName=master&jobName=win&configuration=win_c_compilervs2015cxx_compilervs2015vc14" alt="variant">
                 </a>
               </td>
             </tr>
@@ -83,6 +62,7 @@ Current build status
       </details>
     </td>
   </tr>
+![ppc64le disabled](https://img.shields.io/badge/ppc64le-disabled-lightgrey.svg)
 </table>
 
 Current release info