From a61952123f03cc9f7f9181ba50e912822e4558ba Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:17:57 +0000 Subject: [PATCH 1/2] Rebuild for hdf51142 --- .ci_support/migrations/hdf51142.yaml | 7 +++++++ recipe/meta.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/hdf51142.yaml diff --git a/.ci_support/migrations/hdf51142.yaml b/.ci_support/migrations/hdf51142.yaml new file mode 100644 index 0000000..1517ced --- /dev/null +++ b/.ci_support/migrations/hdf51142.yaml @@ -0,0 +1,7 @@ +__migrator: + build_number: 1 + kind: version + migration_number: 1 +hdf5: +- 1.14.2 +migrator_ts: 1692590899.44706 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eeb6d0c..0f62a6f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: folder: src build: - number: 6 + number: 7 skip: True # [win] From 0fe0e80c27c9c8477098ef2bf9f36a1fe1187dbe Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 23 Aug 2023 14:18:10 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.26.1, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.23.11.04.45 --- .azure-pipelines/azure-pipelines-linux.yml | 5 ----- .ci_support/linux_64_python3.10.____cpython.yaml | 2 +- .ci_support/linux_64_python3.8.____cpython.yaml | 2 +- .ci_support/linux_64_python3.9.____cpython.yaml | 2 +- .ci_support/osx_64_python3.10.____cpython.yaml | 2 +- .ci_support/osx_64_python3.8.____cpython.yaml | 2 +- .ci_support/osx_64_python3.9.____cpython.yaml | 2 +- .scripts/run_osx_build.sh | 2 +- 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 91aec1d..e23c587 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -23,11 +23,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml index 94db84e..2bda425 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_python3.10.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.14.1 +- 1.14.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml index 9a7bb43..45944b0 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_python3.8.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.14.1 +- 1.14.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml index 5b1bde0..0d87bdd 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_python3.9.____cpython.yaml @@ -15,7 +15,7 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 hdf5: -- 1.14.1 +- 1.14.2 pin_run_as_build: python: min_pin: x.x diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml index 1f41cd3..bf6b759 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_python3.10.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '15' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml index 41e7f91..579ce71 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '15' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml index 5be13b6..c8f2023 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_python3.9.____cpython.yaml @@ -13,7 +13,7 @@ cxx_compiler: cxx_compiler_version: - '15' hdf5: -- 1.14.1 +- 1.14.2 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index f169576..5ef2a19 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -55,7 +55,6 @@ source run_conda_forge_build_setup echo -e "\n\nMaking the build clobber file" make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - if [[ -f LICENSE.txt ]]; then cp LICENSE.txt "recipe/recipe-scripts-license.txt" fi @@ -71,6 +70,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else + conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml