From d307c2a94388c141675345bffbeb621e61243c18 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:48:04 +0000 Subject: [PATCH 01/11] regrobot change --- .ci_support/linux_64_.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index c9dcfe7..613023c 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -3,15 +3,15 @@ bzip2: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cairo: - '1' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -21,13 +21,13 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' freetype: - '2' gsl: @@ -55,7 +55,7 @@ libpng: pixman: - '0' proj: -- '9.4' +- '9.5' target_platform: - linux-64 zip_keys: From f3d8cc859882439863e0d34ca7b1fb68f2605fbd Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:48:31 +0000 Subject: [PATCH 02/11] regrobot change --- .ci_support/migrations/libgdal39.yaml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .ci_support/migrations/libgdal39.yaml diff --git a/.ci_support/migrations/libgdal39.yaml b/.ci_support/migrations/libgdal39.yaml deleted file mode 100644 index ffc85a9..0000000 --- a/.ci_support/migrations/libgdal39.yaml +++ /dev/null @@ -1,9 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -gdal: -- '3.9' -libgdal: -- '3.9' -migrator_ts: 1715443551.4913723 From a684639f10755ffe2712ff22e469343dcb4ccd68 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:49:32 +0000 Subject: [PATCH 03/11] regrobot change --- .ci_support/migrations/proj95.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .ci_support/migrations/proj95.yaml diff --git a/.ci_support/migrations/proj95.yaml b/.ci_support/migrations/proj95.yaml new file mode 100644 index 0000000..1bc6042 --- /dev/null +++ b/.ci_support/migrations/proj95.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for proj 9.5 + kind: version + migration_number: 1 +migrator_ts: 1726500049.2640333 +proj: +- '9.5' From 766168d5cf150cca017bd391a94bf4128a1dc2f5 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:50:15 +0000 Subject: [PATCH 04/11] regrobot change --- .ci_support/migrations/proj_loosen_pin.yaml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .ci_support/migrations/proj_loosen_pin.yaml diff --git a/.ci_support/migrations/proj_loosen_pin.yaml b/.ci_support/migrations/proj_loosen_pin.yaml deleted file mode 100644 index 3830824..0000000 --- a/.ci_support/migrations/proj_loosen_pin.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Loosen proj pin to 9.4 - kind: version - migration_number: 1 -migrator_ts: 1717700335 -proj: -- '9.4' From 07aa2c07ac764c3b27f0f39e91f586ad9e0fb1c0 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:51:02 +0000 Subject: [PATCH 05/11] regrobot change --- .ci_support/osx_64_.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index a52d313..ce9fe55 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,11 +21,11 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' gsl: - '2.7' hdf4: @@ -49,11 +49,11 @@ libnetcdf: libpng: - '1.6' llvm_openmp: -- '16' +- '17' macos_machine: - x86_64-apple-darwin13.4.0 proj: -- '9.4' +- '9.5' target_platform: - osx-64 zip_keys: From 70138e6782c4038e152747ec4bbb1a3196d06ff2 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:52:40 +0000 Subject: [PATCH 06/11] regrobot change --- .scripts/build_steps.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index f34ebf2..dc55d4b 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,12 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, @@ -51,7 +57,8 @@ source run_conda_forge_build_setup /usr/bin/sudo -n yum install -y csh byacc -# make the build number clobber + +)# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then @@ -80,6 +87,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}" From 07608b2606af0c2742dcd84933e3df115d64d30b Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:53:22 +0000 Subject: [PATCH 07/11] regrobot change --- .scripts/run_osx_build.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff21..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} @@ -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}" From cc9694d3f13897ef881501731125004f5cf2755d Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:54:08 +0000 Subject: [PATCH 08/11] regrobot change --- build-locally.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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): From 65710b2276cf7e4d44750a635f48249d6ea2c5e3 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 13:54:40 +0000 Subject: [PATCH 09/11] regrobot change --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cd45f28..70d8085 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,7 +21,7 @@ source: folder: triangle_tmp build: - number: 54 + number: 55 # proj95 skip: True # [win] features: detect_binary_files_with_prefix: true From adcdc56cd023d5dc7b2001a99d33c131b48bbdc0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 14:00:22 +0000 Subject: [PATCH 10/11] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.4, and conda-forge-pinning 2024.11.15.10.04.02 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_.yaml | 4 +-- .ci_support/migrations/proj95.yaml | 8 ----- .ci_support/osx_64_.yaml | 6 ++-- .scripts/build_steps.sh | 19 +++++----- .scripts/run_osx_build.sh | 45 +++++++++++++++--------- azure-pipelines.yml | 31 ++++++++++++++-- build-locally.py | 2 +- 8 files changed, 71 insertions(+), 46 deletions(-) delete mode 100644 .ci_support/migrations/proj95.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index c38a01e..94c7e23 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-12 + vmImage: macOS-13 strategy: matrix: osx_64_: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 613023c..af91c70 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cairo: - '1' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -62,7 +62,5 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - fortran_compiler_version -- - c_stdlib_version - - cdt_name zlib: - '1' diff --git a/.ci_support/migrations/proj95.yaml b/.ci_support/migrations/proj95.yaml deleted file mode 100644 index 1bc6042..0000000 --- a/.ci_support/migrations/proj95.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for proj 9.5 - kind: version - migration_number: 1 -migrator_ts: 1726500049.2640333 -proj: -- '9.5' diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index ce9fe55..9e52cf5 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,7 +7,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '17' +- '18' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '17' +- '18' fortran_compiler: - gfortran fortran_compiler_version: @@ -49,7 +49,7 @@ libnetcdf: libpng: - '1.6' llvm_openmp: -- '17' +- '18' macos_machine: - x86_64-apple-darwin13.4.0 proj: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index dc55d4b..5723144 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -31,13 +31,13 @@ pkgs_dirs: solver: libmamba CONDARC +mv /opt/conda/conda-meta/history /opt/conda/conda-meta/history.$(date +%Y-%m-%d-%H-%M-%S) +echo > /opt/conda/conda-meta/history +micromamba install --root-prefix ~/.conda --prefix /opt/conda \ + --yes --override-channels --channel conda-forge --strict-channel-priority \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -55,10 +55,9 @@ ulimit -n 1024 # run "conda smithy rerender" and this line will be updated # automatically. /usr/bin/sudo -n yum install -y csh byacc +) - - -)# make the build number clobber +# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then @@ -89,8 +88,8 @@ else --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" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051..0b36498 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -7,28 +7,39 @@ source .scripts/logging_utils.sh set -xe MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} +MINIFORGE_HOME=${MINIFORGE_HOME%/} # remove trailing slash -( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null - -MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -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} - -( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null +( startgroup "Provisioning base env with micromamba" ) 2> /dev/null +MICROMAMBA_VERSION="1.5.10-0" +if [[ "$(uname -m)" == "arm64" ]]; then + osx_arch="osx-arm64" +else + osx_arch="osx-64" +fi +MICROMAMBA_URL="https://github.com/mamba-org/micromamba-releases/releases/download/${MICROMAMBA_VERSION}/micromamba-${osx_arch}" +MAMBA_ROOT_PREFIX="${MINIFORGE_HOME}-micromamba-$(date +%s)" +echo "Downloading micromamba ${MICROMAMBA_VERSION}" +micromamba_exe="$(mktemp -d)/micromamba" +curl -L -o "${micromamba_exe}" "${MICROMAMBA_URL}" +chmod +x "${micromamba_exe}" +echo "Creating environment" +"${micromamba_exe}" create --yes --root-prefix "${MAMBA_ROOT_PREFIX}" --prefix "${MINIFORGE_HOME}" \ + --channel conda-forge \ + pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +echo "Moving pkgs cache from ${MAMBA_ROOT_PREFIX} to ${MINIFORGE_HOME}" +mv "${MAMBA_ROOT_PREFIX}/pkgs" "${MINIFORGE_HOME}" +echo "Cleaning up micromamba" +rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true +( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh +echo "Activating environment" +source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + @@ -88,8 +99,8 @@ else ( 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" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c..013bdc1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,6 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file +stages: +- stage: Check + jobs: + - job: Skip + pool: + vmImage: 'ubuntu-22.04' + variables: + DECODE_PERCENTS: 'false' + RET: 'true' + steps: + - checkout: self + fetchDepth: '2' + - bash: | + git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` + echo "##vso[task.setvariable variable=log]$git_log" + displayName: Obtain commit message + - bash: echo "##vso[task.setvariable variable=RET]false" + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) + displayName: Skip build? + - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" + name: result + displayName: Export result +- stage: Build + condition: and(succeeded(), eq(dependencies.Check.outputs['Skip.result.start_main'], 'true')) + dependsOn: Check + jobs: + - template: ./.azure-pipelines/azure-pipelines-linux.yml + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 8ac9b84..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,5 +1,5 @@ #!/bin/sh -"""exec' "python3" "$0" "$@" #""" # fmt: off # fmt: on +"""exec" "python3" "$0" "$@" #""" # fmt: off # fmt: on # # This file has been generated by conda-smithy in order to build the recipe # locally. From 8a79746a6dcca29e8ff012908eac4e441dc6c514 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Fri, 15 Nov 2024 16:57:25 +0000 Subject: [PATCH 11/11] try see if proj is indeed the bugger --- .ci_support/linux_64_.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 613023c..c21a5e3 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -55,7 +55,7 @@ libpng: pixman: - '0' proj: -- '9.5' +- '9.4' target_platform: - linux-64 zip_keys: