From 9241ec04c40100566553eb6d8e26a718caf67356 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 14 Mar 2025 00:06:21 +0000 Subject: [PATCH 1/2] Rebuild for libabseil 20250127, libgrpc 1.71 & libprotobuf 5.29.3 --- .ci_support/migrations/absl_grpc_proto.yaml | 21 +++++++++++++++++++++ recipe/meta.yaml | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/absl_grpc_proto.yaml diff --git a/.ci_support/migrations/absl_grpc_proto.yaml b/.ci_support/migrations/absl_grpc_proto.yaml new file mode 100644 index 0000000..058ccee --- /dev/null +++ b/.ci_support/migrations/absl_grpc_proto.yaml @@ -0,0 +1,21 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libabseil 20250127, libgrpc 1.71 & libprotobuf 5.29.3 + kind: version + migration_number: 1 + exclude: + - abseil-cpp + - grpc-cpp + - libprotobuf + - protobuf + - re2 +libabseil: +- 20250127 +libgrpc: +- "1.71" +libprotobuf: +- 5.29.3 +# see https://github.com/grpc/grpc/commit/14ac94d923b80650e0df55bed17be5efa0e4becd +c_stdlib_version: # [osx and x86_64] + - 10.14 # [osx and x86_64] +migrator_ts: 1741118046.5882597 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b51e0cb..bfcde5f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -37,7 +37,7 @@ source: sha256: f2db9f032b48033948679bc4d13a29c6b554bd9e0a435c1805c429818b5207bb folder: paraview/ThirdParty/catalyst/vtkcatalyst/catalyst build: - number: 2 + number: 3 skip: true # [py != 37] requirements: @@ -49,6 +49,7 @@ requirements: - hdf5 - tbb-devel - {{ compiler('c') }} + - {{ stdlib("c") }} - {{ compiler('cxx') }} - {{ cdt('xorg-x11-proto-devel') }} # [linux] - {{ cdt('libx11-devel') }} # [linux] From c2102bcf61ab95060b2d716594ac9a1d0b3df430 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 14 Mar 2025 00:07:08 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 25.1.2, conda-smithy 3.47.0, and conda-forge-pinning 2025.03.13.20.26.56 --- .ci_support/migrations/hdf51142.yaml | 7 ------- .gitattributes | 4 ++-- .gitignore | 28 +++++++++++++++++++++++++++- README.md | 2 +- build-locally.py | 21 ++++++++++++++++----- 5 files changed, 46 insertions(+), 16 deletions(-) delete mode 100644 .ci_support/migrations/hdf51142.yaml diff --git a/.ci_support/migrations/hdf51142.yaml b/.ci_support/migrations/hdf51142.yaml deleted file mode 100644 index 1517ced..0000000 --- a/.ci_support/migrations/hdf51142.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -hdf5: -- 1.14.2 -migrator_ts: 1692590899.44706 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/.gitignore b/.gitignore index c89ecb7..47b5408 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,29 @@ +# User content belongs under recipe/. +# Feedstock configuration goes in `conda-forge.yml` +# Everything else is managed by the conda-smithy rerender process. +# Please do not modify + +# Ignore all files and folders in root +* +!/conda-forge.yml + +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders +!/recipe/** +!/.ci_support/** + +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc -build_artifacts +# Rattler-build's artifacts are in `output` when not specifying anything. +/output +# Pixi's configuration +.pixi diff --git a/README.md b/README.md index 0bfae8a..fdec2b9 100644 --- a/README.md +++ b/README.md @@ -142,5 +142,5 @@ Feedstock Maintainers ===================== * [@cjh1](https://github.com/cjh1/) -* [@conda-forge/event-model](https://github.com/conda-forge/event-model/) +* [@conda-forge/event-model](https://github.com/orgs/conda-forge/teams/event-model/) diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..c4a56c6 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): @@ -23,6 +26,13 @@ def setup_environment(ns): os.path.dirname(__file__), "miniforge3" ) + # The default cache location might not be writable using docker on macOS. + if ns.config.startswith("linux") and platform.system() == "Darwin": + os.environ["CONDA_FORGE_DOCKER_RUN_ARGS"] = ( + os.environ.get("CONDA_FORGE_DOCKER_RUN_ARGS", "") + + " -e RATTLER_CACHE_DIR=/tmp/rattler_cache" + ) + def run_docker_build(ns): script = ".scripts/run_docker_build.sh" @@ -64,8 +74,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." )