From 8a742e1ab93c9d5b141abd51d93a091b40c56a14 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 18 Aug 2024 06:33:53 +0000 Subject: [PATCH 1/4] Rebuild for libboost 1.86 --- .ci_support/migrations/libboost186.yaml | 10 ++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 11 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..7979852 --- /dev/null +++ b/.ci_support/migrations/libboost186.yaml @@ -0,0 +1,10 @@ +__migrator: + build_number: 1 + kind: version + commit_message: "Rebuild for libboost 1.86" + migration_number: 1 +libboost_devel: +- "1.86" +libboost_python_devel: +- "1.86" +migrator_ts: 1723764795.6693385 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bedf1a9..8f0b37c 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: build: skip: True # [osx] skip: True # [win] - number: 4 + number: 5 requirements: build: - {{ compiler('cxx') }} From 6bcc73ef2ce3b078191bb8641607407a0d3e442d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sun, 18 Aug 2024 06:34:28 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.38.0, and conda-forge-pinning 2024.08.17.00.11.41 --- .azure-pipelines/azure-pipelines-linux.yml | 4 ++ ...ux_64_numpy1.22python3.10.____cpython.yaml | 8 ++-- ...nux_64_numpy1.22python3.8.____cpython.yaml | 8 ++-- ...nux_64_numpy1.22python3.9.____cpython.yaml | 8 ++-- ...ux_64_numpy1.23python3.11.____cpython.yaml | 8 ++-- ...ux_64_numpy1.26python3.12.____cpython.yaml | 45 +++++++++++++++++++ .ci_support/migrations/boost1840.yaml | 10 ----- .ci_support/migrations/suitesparse7.yaml | 8 ---- .gitattributes | 4 +- .scripts/build_steps.sh | 6 +++ README.md | 7 +++ build-locally.py | 4 +- 12 files changed, 82 insertions(+), 38 deletions(-) create mode 100644 .ci_support/linux_64_numpy1.26python3.12.____cpython.yaml delete mode 100644 .ci_support/migrations/boost1840.yaml delete mode 100644 .ci_support/migrations/suitesparse7.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 0c1effd..428e0ae 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -24,6 +24,10 @@ jobs: CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_numpy1.26python3.12.____cpython: + CONFIG: linux_64_numpy1.26python3.12.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index d2098ac..d48ca90 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.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: @@ -21,9 +21,9 @@ fortran_compiler_version: hdf5: - 1.14.3 libboost_devel: -- '1.84' +- '1.86' libboost_python_devel: -- '1.84' +- '1.86' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml index 3874789..0109d1c 100644 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.8.____cpython.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: @@ -21,9 +21,9 @@ fortran_compiler_version: hdf5: - 1.14.3 libboost_devel: -- '1.84' +- '1.86' libboost_python_devel: -- '1.84' +- '1.86' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 8548c55..2aebedf 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.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: @@ -21,9 +21,9 @@ fortran_compiler_version: hdf5: - 1.14.3 libboost_devel: -- '1.84' +- '1.86' libboost_python_devel: -- '1.84' +- '1.86' numpy: - '1.22' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 956b31c..51ad7fa 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.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: @@ -21,9 +21,9 @@ fortran_compiler_version: hdf5: - 1.14.3 libboost_devel: -- '1.84' +- '1.86' libboost_python_devel: -- '1.84' +- '1.86' numpy: - '1.23' pin_run_as_build: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml new file mode 100644 index 0000000..80bb44b --- /dev/null +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -0,0 +1,45 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +hdf5: +- 1.14.3 +libboost_devel: +- '1.86' +libboost_python_devel: +- '1.86' +numpy: +- '1.26' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +suitesparse: +- '7' +target_platform: +- linux-64 +zip_keys: +- - c_stdlib_version + - cdt_name +- - cxx_compiler_version + - fortran_compiler_version +- - python + - numpy 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/migrations/suitesparse7.yaml b/.ci_support/migrations/suitesparse7.yaml deleted file mode 100644 index 965e22a..0000000 --- a/.ci_support/migrations/suitesparse7.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for suitesparse 7 - kind: version - migration_number: 1 -migrator_ts: 1714672542.4288294 -suitesparse: -- '7' 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/README.md b/README.md index 6a1c569..d03a5c2 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,13 @@ Current build status variant + + linux_64_numpy1.26python3.12.____cpython + + + variant + + diff --git a/build-locally.py b/build-locally.py index e0d408d..d78427b 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns): From 4a4408768119a409f5e38da82e1fb4cee4924a99 Mon Sep 17 00:00:00 2001 From: h-vetinari Date: Sun, 18 Aug 2024 11:43:00 +0200 Subject: [PATCH 3/4] add setuptools; rely on numpy run-export --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8f0b37c..8037ebb 100755 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -30,7 +30,8 @@ requirements: - libboost-devel - libboost-python-devel - numpy - - python + - python + - setuptools - matplotlib-base - hdf5 - libopenblas # [linux] @@ -41,7 +42,6 @@ requirements: - suitesparse # [linux] - gmsh # [win] run: - - numpy - python - matplotlib-base - openmp From 402da5f6b1c1e8dbfcb5f9b873c13d17c3546244 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 09:13:30 +0000 Subject: [PATCH 4/4] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.0, and conda-forge-pinning 2024.10.10.08.45.34 --- .azure-pipelines/azure-pipelines-linux.yml | 4 -- ...ux_64_numpy1.22python3.10.____cpython.yaml | 4 +- ...nux_64_numpy1.22python3.8.____cpython.yaml | 45 ------------------- ...nux_64_numpy1.22python3.9.____cpython.yaml | 4 +- ...ux_64_numpy1.23python3.11.____cpython.yaml | 4 +- ...ux_64_numpy1.26python3.12.____cpython.yaml | 4 +- .scripts/build_steps.sh | 2 + README.md | 7 --- azure-pipelines.yml | 30 ++++++++++++- build-locally.py | 5 ++- 10 files changed, 42 insertions(+), 67 deletions(-) delete mode 100644 .ci_support/linux_64_numpy1.22python3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 428e0ae..a9ee22f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,10 +12,6 @@ jobs: CONFIG: linux_64_numpy1.22python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_numpy1.22python3.8.____cpython: - CONFIG: linux_64_numpy1.22python3.8.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.22python3.9.____cpython: CONFIG: linux_64_numpy1.22python3.9.____cpython UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml index d48ca90..4ed156f 100644 --- a/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.10.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: 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' hdf5: - 1.14.3 libboost_devel: diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml deleted file mode 100644 index 0109d1c..0000000 --- a/.ci_support/linux_64_numpy1.22python3.8.____cpython.yaml +++ /dev/null @@ -1,45 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-cos7-x86_64 -fortran_compiler: -- gfortran -fortran_compiler_version: -- '12' -hdf5: -- 1.14.3 -libboost_devel: -- '1.86' -libboost_python_devel: -- '1.86' -numpy: -- '1.22' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -suitesparse: -- '7' -target_platform: -- linux-64 -zip_keys: -- - c_stdlib_version - - cdt_name -- - cxx_compiler_version - - fortran_compiler_version -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml index 2aebedf..16a76f3 100644 --- a/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.22python3.9.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: 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' hdf5: - 1.14.3 libboost_devel: diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 51ad7fa..bd67210 100644 --- a/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: 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' hdf5: - 1.14.3 libboost_devel: diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml index 80bb44b..606609a 100644 --- a/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.26python3.12.____cpython.yaml @@ -11,13 +11,13 @@ channel_targets: 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' hdf5: - 1.14.3 libboost_devel: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6c805a9..af0b9ac 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}" diff --git a/README.md b/README.md index d03a5c2..af8b103 100644 --- a/README.md +++ b/README.md @@ -39,13 +39,6 @@ Current build status variant - - linux_64_numpy1.22python3.8.____cpython - - - variant - - linux_64_numpy1.22python3.9.____cpython diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ad85a2c..5797751 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -2,5 +2,31 @@ # update the conda-forge.yml and/or the recipe/meta.yaml. # -*- mode: yaml -*- -jobs: - - template: ./.azure-pipelines/azure-pipelines-linux.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: 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 \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index d78427b..6788aea 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,8 +1,11 @@ -#!/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. # +# 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