From 30c911b4e340c7209e0b21f3b92e2f4813b2c350 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 06:00:38 +0000 Subject: [PATCH 1/2] Rebuild for libhwloc 2.11.2 --- .ci_support/migrations/libhwloc2112.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libhwloc2112.yaml diff --git a/.ci_support/migrations/libhwloc2112.yaml b/.ci_support/migrations/libhwloc2112.yaml new file mode 100644 index 0000000..664a50b --- /dev/null +++ b/.ci_support/migrations/libhwloc2112.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libhwloc 2.11.2 + kind: version + migration_number: 1 +libhwloc: +- 2.11.2 +migrator_ts: 1727390615.47357 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e33d417..a13f523 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "6.0" %} -{% set build_number = 1 %} +{% set build_number = 2 %} {% set sha256 = "de9710223fc1855f833dbbf42ea2681e06aa8ec0464f0201104dc80a74dfd1f2" %} {% set llvm_version = "15.0.7" %} From 64ec19e0b3c1a0c8bf262de56d98edf72f2bc2ad Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 27 Sep 2024 06:02:07 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.40.1, and conda-forge-pinning 2024.09.27.00.47.16 --- .azure-pipelines/azure-pipelines-linux.yml | 12 ++++++------ .azure-pipelines/azure-pipelines-osx.yml | 6 +++--- ...c2.11.1.yaml => linux_64_libhwloc2.11.2.yaml} | 4 ++-- .ci_support/linux_64_libhwloc2.yaml | 2 +- ....1.yaml => linux_aarch64_libhwloc2.11.2.yaml} | 4 ++-- .ci_support/linux_aarch64_libhwloc2.yaml | 2 +- ....1.yaml => linux_ppc64le_libhwloc2.11.2.yaml} | 4 ++-- .ci_support/linux_ppc64le_libhwloc2.yaml | 2 +- .ci_support/migrations/libhwloc2111.yaml | 8 -------- ...loc2.11.1.yaml => osx_64_libhwloc2.11.2.yaml} | 4 ++-- .ci_support/osx_64_libhwloc2.yaml | 2 +- .ci_support/osx_arm64_.yaml | 4 ++-- .scripts/build_steps.sh | 3 ++- .scripts/run_osx_build.sh | 2 +- .travis.yml | 2 +- README.md | 16 ++++++++-------- build-locally.py | 9 ++++++--- 17 files changed, 41 insertions(+), 45 deletions(-) rename .ci_support/{linux_64_libhwloc2.11.1.yaml => linux_64_libhwloc2.11.2.yaml} (95%) rename .ci_support/{linux_aarch64_libhwloc2.11.1.yaml => linux_aarch64_libhwloc2.11.2.yaml} (96%) rename .ci_support/{linux_ppc64le_libhwloc2.11.1.yaml => linux_ppc64le_libhwloc2.11.2.yaml} (95%) delete mode 100644 .ci_support/migrations/libhwloc2111.yaml rename .ci_support/{osx_64_libhwloc2.11.1.yaml => osx_64_libhwloc2.11.2.yaml} (95%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 48d4a28..1db2880 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -13,21 +13,21 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 SHORT_CONFIG: linux_64_libhwloc2 - linux_64_libhwloc2.11.1: - CONFIG: linux_64_libhwloc2.11.1 + linux_64_libhwloc2.11.2: + CONFIG: linux_64_libhwloc2.11.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.2 - SHORT_CONFIG: linux_64_libhwloc2.11.1 + SHORT_CONFIG: linux_64_libhwloc2.11.2 linux_ppc64le_libhwloc2: CONFIG: linux_ppc64le_libhwloc2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 SHORT_CONFIG: linux_ppc64le_libhwloc2 - linux_ppc64le_libhwloc2.11.1: - CONFIG: linux_ppc64le_libhwloc2.11.1 + linux_ppc64le_libhwloc2.11.2: + CONFIG: linux_ppc64le_libhwloc2.11.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 - SHORT_CONFIG: linux_ppc64le_libhwloc2.11.1 + SHORT_CONFIG: linux_ppc64le_libhwloc2.11.2 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 4269562..6758cb6 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -12,10 +12,10 @@ jobs: CONFIG: osx_64_libhwloc2 UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_libhwloc2 - osx_64_libhwloc2.11.1: - CONFIG: osx_64_libhwloc2.11.1 + osx_64_libhwloc2.11.2: + CONFIG: osx_64_libhwloc2.11.2 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_libhwloc2.11.1 + SHORT_CONFIG: osx_64_libhwloc2.11.2 osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_libhwloc2.11.1.yaml b/.ci_support/linux_64_libhwloc2.11.2.yaml similarity index 95% rename from .ci_support/linux_64_libhwloc2.11.1.yaml rename to .ci_support/linux_64_libhwloc2.11.2.yaml index 30539f8..00d9d2d 100644 --- a/.ci_support/linux_64_libhwloc2.11.1.yaml +++ b/.ci_support/linux_64_libhwloc2.11.2.yaml @@ -13,13 +13,13 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.2 enable_cuda: - 'True' libhwloc: -- 2.11.1 +- 2.11.2 target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_libhwloc2.yaml b/.ci_support/linux_64_libhwloc2.yaml index fb114c9..1a1d8b2 100644 --- a/.ci_support/linux_64_libhwloc2.yaml +++ b/.ci_support/linux_64_libhwloc2.yaml @@ -13,7 +13,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cuda:11.2 enable_cuda: diff --git a/.ci_support/linux_aarch64_libhwloc2.11.1.yaml b/.ci_support/linux_aarch64_libhwloc2.11.2.yaml similarity index 96% rename from .ci_support/linux_aarch64_libhwloc2.11.1.yaml rename to .ci_support/linux_aarch64_libhwloc2.11.2.yaml index 3ba8d80..7e70e1c 100644 --- a/.ci_support/linux_aarch64_libhwloc2.11.1.yaml +++ b/.ci_support/linux_aarch64_libhwloc2.11.2.yaml @@ -17,13 +17,13 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 enable_cuda: - 'True' libhwloc: -- 2.11.1 +- 2.11.2 target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_libhwloc2.yaml b/.ci_support/linux_aarch64_libhwloc2.yaml index 5c9195d..20ca08e 100644 --- a/.ci_support/linux_aarch64_libhwloc2.yaml +++ b/.ci_support/linux_aarch64_libhwloc2.yaml @@ -17,7 +17,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 enable_cuda: diff --git a/.ci_support/linux_ppc64le_libhwloc2.11.1.yaml b/.ci_support/linux_ppc64le_libhwloc2.11.2.yaml similarity index 95% rename from .ci_support/linux_ppc64le_libhwloc2.11.1.yaml rename to .ci_support/linux_ppc64le_libhwloc2.11.2.yaml index fcf5eb5..3c8067f 100644 --- a/.ci_support/linux_ppc64le_libhwloc2.11.1.yaml +++ b/.ci_support/linux_ppc64le_libhwloc2.11.2.yaml @@ -13,13 +13,13 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 enable_cuda: - 'True' libhwloc: -- 2.11.1 +- 2.11.2 target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_libhwloc2.yaml b/.ci_support/linux_ppc64le_libhwloc2.yaml index 20c8c44..bdcaa79 100644 --- a/.ci_support/linux_ppc64le_libhwloc2.yaml +++ b/.ci_support/linux_ppc64le_libhwloc2.yaml @@ -13,7 +13,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-ppc64le-cuda:10.2 enable_cuda: diff --git a/.ci_support/migrations/libhwloc2111.yaml b/.ci_support/migrations/libhwloc2111.yaml deleted file mode 100644 index ca90c7a..0000000 --- a/.ci_support/migrations/libhwloc2111.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.11.1 - kind: version - migration_number: 1 -libhwloc: -- 2.11.1 -migrator_ts: 1720471981.8039248 diff --git a/.ci_support/osx_64_libhwloc2.11.1.yaml b/.ci_support/osx_64_libhwloc2.11.2.yaml similarity index 95% rename from .ci_support/osx_64_libhwloc2.11.1.yaml rename to .ci_support/osx_64_libhwloc2.11.2.yaml index 8f1c2c5..b4c1024 100644 --- a/.ci_support/osx_64_libhwloc2.11.1.yaml +++ b/.ci_support/osx_64_libhwloc2.11.2.yaml @@ -15,11 +15,11 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' enable_cuda: - 'False' libhwloc: -- 2.11.1 +- 2.11.2 macos_machine: - x86_64-apple-darwin13.4.0 target_platform: diff --git a/.ci_support/osx_64_libhwloc2.yaml b/.ci_support/osx_64_libhwloc2.yaml index be2707d..d7a43be 100644 --- a/.ci_support/osx_64_libhwloc2.yaml +++ b/.ci_support/osx_64_libhwloc2.yaml @@ -15,7 +15,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' enable_cuda: - 'False' libhwloc: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index cd55937..5b6ef7b 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -15,11 +15,11 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' enable_cuda: - 'False' libhwloc: -- 2.11.1 +- 2.11.2 macos_machine: - arm64-apple-darwin20.0.0 target_platform: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5cab95..5ca92d7 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,8 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup + + # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -71,7 +73,6 @@ 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 diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c879..420f051 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} diff --git a/.travis.yml b/.travis.yml index 8c2e554..279c4cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ jobs: arch: arm64 dist: focal - - env: CONFIG=linux_aarch64_libhwloc2.11.1 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 + - env: CONFIG=linux_aarch64_libhwloc2.11.2 UPLOAD_PACKAGES=True PLATFORM=linux-aarch64 DOCKER_IMAGE=quay.io/condaforge/linux-anvil-aarch64-cuda:11.2 os: linux arch: arm64 dist: focal diff --git a/README.md b/README.md index 5db5c1a..3c5c6ca 100644 --- a/README.md +++ b/README.md @@ -45,10 +45,10 @@ Current build status - linux_64_libhwloc2.11.1 + linux_64_libhwloc2.11.2 - variant + variant @@ -59,10 +59,10 @@ Current build status - linux_aarch64_libhwloc2.11.1 + linux_aarch64_libhwloc2.11.2 - variant + variant @@ -73,10 +73,10 @@ Current build status - linux_ppc64le_libhwloc2.11.1 + linux_ppc64le_libhwloc2.11.2 - variant + variant @@ -87,10 +87,10 @@ Current build status - osx_64_libhwloc2.11.1 + osx_64_libhwloc2.11.2 - variant + variant diff --git a/build-locally.py b/build-locally.py index e0d408d..6788aea 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):