From f89ba621513b393b7bc7a6f60131b791cfa801fb Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:29:31 +0000 Subject: [PATCH 1/2] Rebuild for libboost 1.86 --- .ci_support/migrations/libboost186.yaml | 14 ++++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libboost186.yaml diff --git a/.ci_support/migrations/libboost186.yaml b/.ci_support/migrations/libboost186.yaml new file mode 100644 index 0000000..001c6a6 --- /dev/null +++ b/.ci_support/migrations/libboost186.yaml @@ -0,0 +1,14 @@ +__migrator: + build_number: 1 + kind: version + commit_message: "Rebuild for libboost 1.86" + migration_number: 1 +assimp: +- 5.4.2 +libboost_devel: +- "1.86" +libboost_headers: +- "1.86" +libboost_python_devel: +- "1.86" +migrator_ts: 1723764795.6693385 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 71a44af..658bcfc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 5cf2b2eb3922150bc07b7f1ac36e7422420c797fea13e77887b090de242bbf07 build: - number: 1 + number: 2 outputs: - name: libthermo From 00e6ae793a0ebe8eafd8d611c5529e19a5d5ef99 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:30:26 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.16.19.13.37 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 10 +++++----- .ci_support/migrations/boost1840.yaml | 10 ---------- .ci_support/osx_64_.yaml | 12 +++++++----- .ci_support/win_64_.yaml | 4 ++-- .gitattributes | 4 ++-- .scripts/build_steps.sh | 6 ++++++ .scripts/run_osx_build.sh | 9 ++++++++- .scripts/run_win_build.bat | 5 +++++ build-locally.py | 9 ++++++--- 11 files changed, 43 insertions(+), 30 deletions(-) delete mode 100644 .ci_support/migrations/boost1840.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index ae4e0e7..a8ca2b4 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macOS-12 strategy: matrix: osx_64_: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,7 +24,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 0376ed9..e2dbebf 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,9 +1,9 @@ c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -11,11 +11,11 @@ channel_targets: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 libboost_python_devel: -- '1.84' +- '1.86' pin_run_as_build: python: min_pin: x.x @@ -25,7 +25,7 @@ pybind11_abi: python: - 3.10.* *_cpython - 3.11.* *_cpython -- 3.8.* *_cpython +- 3.12.* *_cpython - 3.9.* *_cpython target_platform: - linux-64 diff --git a/.ci_support/migrations/boost1840.yaml b/.ci_support/migrations/boost1840.yaml deleted file mode 100644 index 5d6e74c..0000000 --- a/.ci_support/migrations/boost1840.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - kind: version - commit_message: "Rebuild for libboost 1.84" - migration_number: 1 -libboost_devel: -- "1.84" -libboost_python_devel: -- "1.84" -migrator_ts: 1700834511.141209 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a009842..76019f3 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,9 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '10.13' +MACOSX_SDK_VERSION: +- '10.13' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.9' +- '10.13' channel_sources: - conda-forge channel_targets: @@ -11,9 +13,9 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' libboost_python_devel: -- '1.84' +- '1.86' macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: @@ -25,7 +27,7 @@ pybind11_abi: python: - 3.10.* *_cpython - 3.11.* *_cpython -- 3.8.* *_cpython +- 3.12.* *_cpython - 3.9.* *_cpython target_platform: - osx-64 diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 6a2ed61..179b61e 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -7,7 +7,7 @@ channel_targets: cxx_compiler: - vs2019 libboost_python_devel: -- '1.84' +- '1.86' pin_run_as_build: python: min_pin: x.x @@ -17,7 +17,7 @@ pybind11_abi: python: - 3.10.* *_cpython - 3.11.* *_cpython -- 3.8.* *_cpython +- 3.12.* *_cpython - 3.9.* *_cpython target_platform: - win-64 diff --git a/.gitattributes b/.gitattributes index 7f32763..18f114a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,8 +20,8 @@ bld.bat text eol=crlf .travis.yml linguist-generated=true .scripts/* linguist-generated=true .woodpecker.yml linguist-generated=true -LICENSE.txt linguist-generated=true -README.md linguist-generated=true +/LICENSE.txt linguist-generated=true +/README.md linguist-generated=true azure-pipelines.yml linguist-generated=true build-locally.py linguist-generated=true shippable.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2f3df6c..6c805a9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,6 +69,12 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 165fa51..4ebc38f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -11,7 +11,7 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Mambaforge-MacOSX-$(uname -m).sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} @@ -81,6 +81,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 7491838..24ef201 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -53,6 +53,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" diff --git a/build-locally.py b/build-locally.py index e0d408d..8ac9b84 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,13 +1,16 @@ -#!/usr/bin/env python3 +#!/bin/sh +"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os +# The line above this comment is a bash / sh / zsh guard +# to stop people from running it with the wrong interpreter import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns):