diff --git a/.ci_support/linux_64_mpi_typeconda.yaml b/.ci_support/linux_64_mpi_typeconda.yaml index 20d9c95..473399f 100644 --- a/.ci_support/linux_64_mpi_typeconda.yaml +++ b/.ci_support/linux_64_mpi_typeconda.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' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_64_mpi_typeexternal.yaml b/.ci_support/linux_64_mpi_typeexternal.yaml index 4e650b3..d626a29 100644 --- a/.ci_support/linux_64_mpi_typeexternal.yaml +++ b/.ci_support/linux_64_mpi_typeexternal.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' mpi_type: - external target_platform: diff --git a/.ci_support/linux_aarch64_mpi_typeconda.yaml b/.ci_support/linux_aarch64_mpi_typeconda.yaml index 6d0b5fa..9f56e8e 100644 --- a/.ci_support/linux_aarch64_mpi_typeconda.yaml +++ b/.ci_support/linux_aarch64_mpi_typeconda.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' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_aarch64_mpi_typeexternal.yaml b/.ci_support/linux_aarch64_mpi_typeexternal.yaml index c2ead7e..8ef2580 100644 --- a/.ci_support/linux_aarch64_mpi_typeexternal.yaml +++ b/.ci_support/linux_aarch64_mpi_typeexternal.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' mpi_type: - external target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeconda.yaml b/.ci_support/linux_ppc64le_mpi_typeconda.yaml index 35f41fc..04fc5dc 100644 --- a/.ci_support/linux_ppc64le_mpi_typeconda.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeconda.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' mpi_type: - conda target_platform: diff --git a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml b/.ci_support/linux_ppc64le_mpi_typeexternal.yaml index af858f6..daf8ca3 100644 --- a/.ci_support/linux_ppc64le_mpi_typeexternal.yaml +++ b/.ci_support/linux_ppc64le_mpi_typeexternal.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' mpi_type: - external target_platform: diff --git a/.ci_support/osx_64_mpi_typeconda.yaml b/.ci_support/osx_64_mpi_typeconda.yaml index 0b2c46d..ca2512a 100644 --- a/.ci_support/osx_64_mpi_typeconda.yaml +++ b/.ci_support/osx_64_mpi_typeconda.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' macos_machine: - x86_64-apple-darwin13.4.0 mpi_type: diff --git a/.ci_support/osx_64_mpi_typeexternal.yaml b/.ci_support/osx_64_mpi_typeexternal.yaml index f101bf7..5a40c50 100644 --- a/.ci_support/osx_64_mpi_typeexternal.yaml +++ b/.ci_support/osx_64_mpi_typeexternal.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' macos_machine: - x86_64-apple-darwin13.4.0 mpi_type: diff --git a/.ci_support/osx_arm64_mpi_typeconda.yaml b/.ci_support/osx_arm64_mpi_typeconda.yaml index 3763f46..5eb3f58 100644 --- a/.ci_support/osx_arm64_mpi_typeconda.yaml +++ b/.ci_support/osx_arm64_mpi_typeconda.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' macos_machine: - arm64-apple-darwin20.0.0 mpi_type: diff --git a/.ci_support/osx_arm64_mpi_typeexternal.yaml b/.ci_support/osx_arm64_mpi_typeexternal.yaml index 9b468e6..a4d4508 100644 --- a/.ci_support/osx_arm64_mpi_typeexternal.yaml +++ b/.ci_support/osx_arm64_mpi_typeexternal.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' macos_machine: - arm64-apple-darwin20.0.0 mpi_type: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251..856f469 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/.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..6788aea 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): diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8de02f0..2c2bc5d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -66,10 +66,7 @@ outputs: - name: mpich-mpicc build: script: - - echo 'ok' # [not osx] - # make CONDA_BUILD_SYSROOT a 'used variable' - # so that conda-build knows to pass it to the test env - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + - echo 'ok' requirements: run: - {{ pin_subpackage('mpich', exact=True) }} @@ -84,10 +81,7 @@ outputs: - name: mpich-mpicxx build: script: - - echo 'ok' # [not osx] - # make CONDA_BUILD_SYSROOT a 'used variable' - # so that conda-build knows to pass it to the test env - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + - echo 'ok' requirements: run: - {{ pin_subpackage('mpich', exact=True) }} @@ -102,10 +96,7 @@ outputs: - name: mpich-mpifort build: script: - - echo 'ok' # [not osx] - # make CONDA_BUILD_SYSROOT a 'used variable' - # so that conda-build knows to pass it to the test env - - echo "{{ CONDA_BUILD_SYSROOT }}" # [osx] + - echo 'ok' requirements: run: - {{ pin_subpackage('mpich', exact=True) }}