From 135ee1a3bf657a6ea83cccc4d22b4c1308cda615 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 00:14:30 +0000 Subject: [PATCH] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and conda-forge-pinning 2024.07.16.17.39.45 --- .ci_support/linux_64_.yaml | 8 ++++---- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 6 ++++-- .ci_support/osx_arm64_.yaml | 6 ++++-- .ci_support/win_64_.yaml | 4 ++-- .gitattributes | 4 ++-- .scripts/build_steps.sh | 6 ++++++ .scripts/run_osx_build.sh | 7 +++++++ .scripts/run_win_build.bat | 5 +++++ 10 files changed, 38 insertions(+), 16 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6644821a..fe5b758b 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,11 +3,11 @@ bzip2: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -54,6 +54,6 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 968bd14a..a0b7af09 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -11,7 +11,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -58,6 +58,6 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index d94f46b6..0297a3fc 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -7,7 +7,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -54,6 +54,6 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index b6e4ed4a..e7e616e1 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '10.13' +MACOSX_SDK_VERSION: +- '10.13' bzip2: - '1' c_stdlib: @@ -7,7 +9,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -52,6 +54,6 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 653c9bd5..0b667884 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -1,5 +1,7 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' +MACOSX_SDK_VERSION: +- '11.0' bzip2: - '1' c_stdlib: @@ -7,7 +9,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -49,6 +51,6 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index a08f9720..21f1a4c2 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -3,7 +3,7 @@ bzip2: c_stdlib: - vs channel_sources: -- conda-forge/label/numpy_rc,conda-forge +- conda-forge channel_targets: - conda-forge main cxx_compiler: @@ -44,6 +44,6 @@ zip_keys: - numpy - python_impl zlib: -- '1.2' +- '1' zstd: - '1.5' diff --git a/.gitattributes b/.gitattributes index 7f327638..18f114a1 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 899ba03c..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,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 07dff219..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,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 6d546976..65650bf2 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,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:*/=%"