From 2165ded6d3b94d80c452279499406f0466b786e8 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 4 Sep 2024 19:01:44 +0000 Subject: [PATCH] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.1, and conda-forge-pinning 2024.09.04.18.34.51 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 12 ++++++------ .ci_support/linux_aarch64_.yaml | 8 ++++---- .ci_support/linux_ppc64le_.yaml | 8 ++++---- .ci_support/migrations/mumps572.yaml | 10 ---------- .ci_support/osx_64_.yaml | 8 ++++---- .ci_support/osx_arm64_.yaml | 8 ++++---- .ci_support/win_64_.yaml | 2 +- .scripts/build_steps.sh | 1 - .scripts/run_osx_build.sh | 2 +- build-locally.py | 9 ++++++--- 11 files changed, 31 insertions(+), 39 deletions(-) delete mode 100644 .ci_support/migrations/mumps572.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index d609fcd..204327b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -24,7 +24,7 @@ jobs: scriptSource: inline script: | import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe' path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" urllib.request.urlretrieve(url, path) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 5cc08aa..fe71fc5 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,13 +1,13 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -15,13 +15,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' libblas: - 3.9 *netlib liblapack: @@ -29,7 +29,7 @@ liblapack: metis: - 5.1.0 mumps_seq: -- 5.7.2 +- 5.7.3 target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 1407c98..51a51e7 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -3,7 +3,7 @@ BUILD: c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -19,13 +19,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' libblas: - 3.9 *netlib liblapack: @@ -33,7 +33,7 @@ liblapack: metis: - 5.1.0 mumps_seq: -- 5.7.2 +- 5.7.3 target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 81066e0..d2b10ee 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,7 +1,7 @@ c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -15,13 +15,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' libblas: - 3.9 *netlib liblapack: @@ -29,7 +29,7 @@ liblapack: metis: - 5.1.0 mumps_seq: -- 5.7.2 +- 5.7.3 target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/migrations/mumps572.yaml b/.ci_support/migrations/mumps572.yaml deleted file mode 100644 index a405507..0000000 --- a/.ci_support/migrations/mumps572.yaml +++ /dev/null @@ -1,10 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for mumps 5.7.2 - kind: version - migration_number: 1 -migrator_ts: 1718742215.2818363 -mumps_mpi: -- 5.7.2 -mumps_seq: -- 5.7.2 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 9c9e1f7..213b9f0 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,11 +17,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' libblas: - 3.9 *netlib liblapack: @@ -31,7 +31,7 @@ macos_machine: metis: - 5.1.0 mumps_seq: -- 5.7.2 +- 5.7.3 target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 6f15c94..6603ccd 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -5,7 +5,7 @@ MACOSX_SDK_VERSION: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -17,11 +17,11 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' fortran_compiler: - gfortran fortran_compiler_version: -- '12' +- '13' libblas: - 3.9 *netlib liblapack: @@ -31,7 +31,7 @@ macos_machine: metis: - 5.1.0 mumps_seq: -- 5.7.2 +- 5.7.3 target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 143ddcc..65efab2 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -19,6 +19,6 @@ liblapack: metis: - 5.1.0 mumps_seq: -- 5.7.2 +- 5.7.3 target_platform: - win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8..ba4b251 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,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/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):