From 6272906ad0effa5b289480d376ad6c41e1f8f3f7 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 28 Jul 2023 09:47:54 +1100 Subject: [PATCH] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.07.27.11.28.36 --- .azure-pipelines/azure-pipelines-osx.yml | 33 --------- .azure-pipelines/azure-pipelines-win.yml | 1 + .ci_support/osx_64_.yaml | 23 ------ .scripts/run_osx_build.sh | 90 ------------------------ README.md | 15 +--- azure-pipelines.yml | 3 +- 6 files changed, 5 insertions(+), 160 deletions(-) delete mode 100644 .azure-pipelines/azure-pipelines-osx.yml delete mode 100644 .ci_support/osx_64_.yaml delete mode 100755 .scripts/run_osx_build.sh diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml deleted file mode 100644 index 9e4e167..0000000 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ /dev/null @@ -1,33 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: osx - pool: - vmImage: macOS-11 - strategy: - matrix: - osx_64_: - CONFIG: osx_64_ - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - - steps: - # TODO: Fast finish on azure pipelines? - - script: | - export CI=azure - export OSX_FORCE_SDK_DOWNLOAD="1" - export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) - if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then - export IS_PR_BUILD="True" - else - export IS_PR_BUILD="False" - fi - ./.scripts/run_osx_build.sh - displayName: Run OSX build - env: - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 75da5df..4819fc2 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,7 @@ jobs: timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ + SET_PAGEFILE: 'True' UPLOAD_TEMP: D:\\tmp steps: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml deleted file mode 100644 index 9760adb..0000000 --- a/.ci_support/osx_64_.yaml +++ /dev/null @@ -1,23 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '17' -channel_sources: -- conda-forge/label/llvm_rc,conda-forge -channel_targets: -- conda-forge llvm_rc -cxx_compiler: -- clangxx -cxx_compiler_version: -- '17' -macos_machine: -- x86_64-apple-darwin13.4.0 -target_platform: -- osx-64 -zip_keys: -- - c_compiler_version - - cxx_compiler_version -zlib: -- '1.2' diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh deleted file mode 100755 index 5ef2a19..0000000 --- a/.scripts/run_osx_build.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env bash - -# -*- mode: jinja-shell -*- - -source .scripts/logging_utils.sh - -set -xe - -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" -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 "Configuring conda" ) 2> /dev/null - -source ${MINIFORGE_HOME}/etc/profile.d/conda.sh -conda activate base - -mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 -mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 - - - -echo -e "\n\nSetting up the condarc and mangling the compiler." -setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - -if [[ "${CI:-}" != "" ]]; then - mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -fi - -if [[ "${CI:-}" != "" ]]; then - echo -e "\n\nMangling homebrew in the CI to avoid conflicts." - /usr/bin/sudo mangle_homebrew - /usr/bin/sudo -k -else - echo -e "\n\nNot mangling homebrew as we are not running in CI" -fi - -echo -e "\n\nRunning the build setup script." -source run_conda_forge_build_setup - - - -( endgroup "Configuring conda" ) 2> /dev/null - -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 - -if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then - if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" - fi - conda debug ./recipe -m ./.ci_support/${CONFIG}.yaml \ - ${EXTRA_CB_OPTIONS:-} \ - --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - - # 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 - ( startgroup "Validating outputs" ) 2> /dev/null - - validate_recipe_outputs "${FEEDSTOCK_NAME}" - - ( endgroup "Validating outputs" ) 2> /dev/null - - ( startgroup "Uploading packages" ) 2> /dev/null - - if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then - upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml - fi - - ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file diff --git a/README.md b/README.md index b9d0d32..7dabe7a 100644 --- a/README.md +++ b/README.md @@ -35,13 +35,6 @@ Current build status variant - - osx_64 - - - variant - - win_64 @@ -64,12 +57,10 @@ Current release info | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-flang-green.svg)](https://anaconda.org/conda-forge/flang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/flang.svg)](https://anaconda.org/conda-forge/flang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/flang.svg)](https://anaconda.org/conda-forge/flang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/flang.svg)](https://anaconda.org/conda-forge/flang) | | [![Conda Recipe](https://img.shields.io/badge/recipe-flang_linux--64-green.svg)](https://anaconda.org/conda-forge/flang_linux-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/flang_linux-64.svg)](https://anaconda.org/conda-forge/flang_linux-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/flang_linux-64.svg)](https://anaconda.org/conda-forge/flang_linux-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/flang_linux-64.svg)](https://anaconda.org/conda-forge/flang_linux-64) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-flang_osx--64-green.svg)](https://anaconda.org/conda-forge/flang_osx-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/flang_osx-64.svg)](https://anaconda.org/conda-forge/flang_osx-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/flang_osx-64.svg)](https://anaconda.org/conda-forge/flang_osx-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/flang_osx-64.svg)](https://anaconda.org/conda-forge/flang_osx-64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-flang_win--64-green.svg)](https://anaconda.org/conda-forge/flang_win-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/flang_win-64.svg)](https://anaconda.org/conda-forge/flang_win-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/flang_win-64.svg)](https://anaconda.org/conda-forge/flang_win-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/flang_win-64.svg)](https://anaconda.org/conda-forge/flang_win-64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libflang-green.svg)](https://anaconda.org/conda-forge/libflang) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libflang.svg)](https://anaconda.org/conda-forge/libflang) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libflang.svg)](https://anaconda.org/conda-forge/libflang) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libflang.svg)](https://anaconda.org/conda-forge/libflang) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libfortran--main-green.svg)](https://anaconda.org/conda-forge/libfortran-main) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libfortran-main.svg)](https://anaconda.org/conda-forge/libfortran-main) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libfortran-main.svg)](https://anaconda.org/conda-forge/libfortran-main) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libfortran-main.svg)](https://anaconda.org/conda-forge/libfortran-main) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libfortran--main_linux--64-green.svg)](https://anaconda.org/conda-forge/libfortran-main_linux-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libfortran-main_linux-64.svg)](https://anaconda.org/conda-forge/libfortran-main_linux-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libfortran-main_linux-64.svg)](https://anaconda.org/conda-forge/libfortran-main_linux-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libfortran-main_linux-64.svg)](https://anaconda.org/conda-forge/libfortran-main_linux-64) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libfortran--main_osx--64-green.svg)](https://anaconda.org/conda-forge/libfortran-main_osx-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libfortran-main_osx-64.svg)](https://anaconda.org/conda-forge/libfortran-main_osx-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libfortran-main_osx-64.svg)](https://anaconda.org/conda-forge/libfortran-main_osx-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libfortran-main_osx-64.svg)](https://anaconda.org/conda-forge/libfortran-main_osx-64) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libfortran--main_win--64-green.svg)](https://anaconda.org/conda-forge/libfortran-main_win-64) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libfortran-main_win-64.svg)](https://anaconda.org/conda-forge/libfortran-main_win-64) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libfortran-main_win-64.svg)](https://anaconda.org/conda-forge/libfortran-main_win-64) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libfortran-main_win-64.svg)](https://anaconda.org/conda-forge/libfortran-main_win-64) | Installing flang @@ -82,16 +73,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `flang, flang_linux-64, flang_osx-64, flang_win-64, libflang, libfortran-main, libfortran-main_linux-64, libfortran-main_osx-64, libfortran-main_win-64` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `flang, flang_linux-64, flang_win-64, libflang, libfortran-main, libfortran-main_linux-64, libfortran-main_win-64` can be installed with `conda`: ``` -conda install flang flang_linux-64 flang_osx-64 flang_win-64 libflang libfortran-main libfortran-main_linux-64 libfortran-main_osx-64 libfortran-main_win-64 +conda install flang flang_linux-64 flang_win-64 libflang libfortran-main libfortran-main_linux-64 libfortran-main_win-64 ``` or with `mamba`: ``` -mamba install flang flang_linux-64 flang_osx-64 flang_win-64 libflang libfortran-main libfortran-main_linux-64 libfortran-main_osx-64 libfortran-main_win-64 +mamba install flang flang_linux-64 flang_win-64 libflang libfortran-main libfortran-main_linux-64 libfortran-main_win-64 ``` It is possible to list all of the versions of `flang` available on your platform with `conda`: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..baa1c2b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,4 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file