From aa8d1e98f420fb1d97fcc7d0fb5dd3080cedc09c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 12 Jan 2022 15:04:26 +0000 Subject: [PATCH] MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.16.1, and conda-forge-pinning 2022.01.12.13.11.41 --- .azure-pipelines/azure-pipelines-linux.yml | 15 +++++++-- .azure-pipelines/azure-pipelines-osx.yml | 5 +++ .azure-pipelines/azure-pipelines-win.yml | 8 ++--- ...las_implblisblas_impl_liblibblis.so.3.yaml | 8 ++--- ...blas_implmklblas_impl_liblibmkl_rt.so.yaml | 8 ++--- ...openblasblas_impl_liblibopenblas.so.0.yaml | 8 ++--- .ci_support/linux_ppc64le_.yaml | 2 +- ..._implblisblas_impl_liblibblis.3.dylib.yaml | 4 ++- ...s_implmklblas_impl_liblibmkl_rt.dylib.yaml | 4 ++- ...nblasblas_impl_liblibopenblas.0.dylib.yaml | 4 ++- .ci_support/osx_arm64_.yaml | 2 +- ...as_implblisblas_impl_liblibblis.3.dll.yaml | 4 ++- ...blas_implmklblas_impl_libmkl_rt.1.dll.yaml | 4 ++- ...implopenblasblas_impl_libopenblas.dll.yaml | 4 ++- .drone.yml | 31 ------------------- .gitattributes | 1 + .scripts/build_steps.sh | 15 +++++---- .scripts/run_docker_build.sh | 7 +++-- .scripts/run_osx_build.sh | 14 +++++---- README.md | 12 ++----- build-locally.py | 5 +++ 21 files changed, 84 insertions(+), 81 deletions(-) delete mode 100644 .drone.yml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aa1d81b2..93f2b2e8 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -11,15 +11,19 @@ jobs: linux_64_blas_implblisblas_impl_liblibblis.so.3: CONFIG: linux_64_blas_implblisblas_impl_liblibblis.so.3 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_blas_implmklblas_impl_liblibmkl_rt.so: CONFIG: linux_64_blas_implmklblas_impl_liblibmkl_rt.so UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0: CONFIG: linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0 UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_: + CONFIG: linux_aarch64_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 linux_ppc64le_: CONFIG: linux_ppc64le_ UPLOAD_PACKAGES: 'True' @@ -44,6 +48,11 @@ jobs: export CI=azure 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_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index b0a4641c..c70a9fa3 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -29,6 +29,11 @@ jobs: 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: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 0bd675a9..60c35b3e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 strategy: matrix: win_64_blas_implblisblas_impl_liblibblis.3.dll: @@ -58,7 +58,7 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional + packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment @@ -92,7 +92,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 @@ -113,4 +113,4 @@ jobs: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.3.yaml b/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.3.yaml index 6c13f1e0..1c5f2be0 100644 --- a/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.3.yaml +++ b/.ci_support/linux_64_blas_implblisblas_impl_liblibblis.so.3.yaml @@ -11,15 +11,17 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: - '9' +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: @@ -29,5 +31,3 @@ zip_keys: - blas_impl_lib - - c_compiler_version - fortran_compiler_version -- - cdt_name - - docker_image diff --git a/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml b/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml index 9f300a02..c57240b3 100644 --- a/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml +++ b/.ci_support/linux_64_blas_implmklblas_impl_liblibmkl_rt.so.yaml @@ -11,15 +11,17 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: - '9' +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: @@ -29,5 +31,3 @@ zip_keys: - blas_impl_lib - - c_compiler_version - fortran_compiler_version -- - cdt_name - - docker_image diff --git a/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml b/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml index 50c16f99..d93d9d39 100644 --- a/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml +++ b/.ci_support/linux_64_blas_implopenblasblas_impl_liblibopenblas.so.0.yaml @@ -11,15 +11,17 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: -- quay.io/condaforge/linux-anvil-comp7 +- quay.io/condaforge/linux-anvil-cos7-x86_64 fortran_compiler: - gfortran fortran_compiler_version: - '9' +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: @@ -29,5 +31,3 @@ zip_keys: - blas_impl_lib - - c_compiler_version - fortran_compiler_version -- - cdt_name - - docker_image diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 7b6126b7..0ef13103 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -11,7 +11,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.3.dylib.yaml b/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.3.dylib.yaml index 822f8d47..d084071b 100644 --- a/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.3.dylib.yaml +++ b/.ci_support/osx_64_blas_implblisblas_impl_liblibblis.3.dylib.yaml @@ -11,7 +11,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main fortran_compiler: @@ -20,6 +20,8 @@ fortran_compiler_version: - '9' macos_machine: - x86_64-apple-darwin13.4.0 +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: diff --git a/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml b/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml index 3336f601..0263d7e3 100644 --- a/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml +++ b/.ci_support/osx_64_blas_implmklblas_impl_liblibmkl_rt.dylib.yaml @@ -11,7 +11,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main fortran_compiler: @@ -20,6 +20,8 @@ fortran_compiler_version: - '9' macos_machine: - x86_64-apple-darwin13.4.0 +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: diff --git a/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml b/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml index 45443003..3ebc2edc 100644 --- a/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml +++ b/.ci_support/osx_64_blas_implopenblasblas_impl_liblibopenblas.0.dylib.yaml @@ -11,7 +11,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main fortran_compiler: @@ -20,6 +20,8 @@ fortran_compiler_version: - '9' macos_machine: - x86_64-apple-darwin13.4.0 +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index db0cf46f..ba5c0788 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -11,7 +11,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main fortran_compiler: diff --git a/.ci_support/win_64_blas_implblisblas_impl_liblibblis.3.dll.yaml b/.ci_support/win_64_blas_implblisblas_impl_liblibblis.3.dll.yaml index 5b39ba13..caad9caf 100644 --- a/.ci_support/win_64_blas_implblisblas_impl_liblibblis.3.dll.yaml +++ b/.ci_support/win_64_blas_implblisblas_impl_liblibblis.3.dll.yaml @@ -5,13 +5,15 @@ blas_impl: blas_impl_lib: - libblis.3.dll channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main m2w64_c_compiler: - m2w64-toolchain m2w64_fortran_compiler: - m2w64-toolchain +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: diff --git a/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.1.dll.yaml b/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.1.dll.yaml index 505ce5fc..a11f8039 100644 --- a/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.1.dll.yaml +++ b/.ci_support/win_64_blas_implmklblas_impl_libmkl_rt.1.dll.yaml @@ -5,13 +5,15 @@ blas_impl: blas_impl_lib: - mkl_rt.1.dll channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main m2w64_c_compiler: - m2w64-toolchain m2w64_fortran_compiler: - m2w64-toolchain +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: diff --git a/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml b/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml index bd9f73d0..7268acaf 100644 --- a/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml +++ b/.ci_support/win_64_blas_implopenblasblas_impl_libopenblas.dll.yaml @@ -5,13 +5,15 @@ blas_impl: blas_impl_lib: - openblas.dll channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main m2w64_c_compiler: - m2w64-toolchain m2w64_fortran_compiler: - m2w64-toolchain +mkl_devel: +- '2021' openblas: - 0.3.* target_platform: diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index af150917..00000000 --- a/.drone.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -kind: pipeline -name: linux_aarch64_ - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_ - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - diff --git a/.gitattributes b/.gitattributes index 9060b272..ce52713a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,6 +18,7 @@ bld.bat text eol=crlf .gitignore linguist-generated=true .travis.yml linguist-generated=true .scripts/* linguist-generated=true +.woodpecker.yml linguist-generated=true LICENSE.txt linguist-generated=true README.md linguist-generated=true azure-pipelines.yml linguist-generated=true diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 99baf86d..b3d5b819 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -5,6 +5,8 @@ # changes to this script, consider a proposal to conda-smithy so that other feedstocks can also # benefit from the improvement. +# -*- mode: jinja-shell -*- + set -xeuo pipefail export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}" source ${FEEDSTOCK_ROOT}/.scripts/logging_utils.sh @@ -25,9 +27,10 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -BUILD_CMD=build -conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge + +mamba install --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge +mamba update --update-specs --yes --quiet "conda-forge-ci-setup=3" conda-build pip boa -c conda-forge # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -37,8 +40,8 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then - EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then + EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi @@ -55,7 +58,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda $BUILD_CMD "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" ( startgroup "Validating outputs" ) 2> /dev/null @@ -66,7 +69,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1f..0c6515fc 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -75,12 +75,15 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" +docker pull "${DOCKER_IMAGE}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ @@ -91,9 +94,9 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e FEEDSTOCK_TOKEN \ -e STAGING_BINSTAR_TOKEN \ - $DOCKER_IMAGE \ + "${DOCKER_IMAGE}" \ bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh + "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" # verify that the end of the script was reached test -f "$DONE_CANARY" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 708b1e1f..6774b01e 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# -*- mode: jinja-shell -*- + source .scripts/logging_utils.sh set -xe @@ -9,21 +11,21 @@ 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="Miniforge3-MacOSX-x86_64.sh" +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 -BUILD_CMD=build - source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base echo -e "\n\nInstalling conda-forge-ci-setup=3 and conda-build." -conda install -n base --quiet --yes "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} +mamba install -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa +mamba update -n base --update-specs --quiet --yes "conda-forge-ci-setup=3" conda-build pip boa @@ -57,7 +59,7 @@ if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi -conda $BUILD_CMD ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} +conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml --suppress-variables --clobber-file ./.ci_support/clobber_${CONFIG}.yaml ${EXTRA_CB_OPTIONS:-} ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" @@ -66,7 +68,7 @@ validate_recipe_outputs "${FEEDSTOCK_NAME}" ( startgroup "Uploading packages" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then +if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi diff --git a/README.md b/README.md index 8ca18188..c986279e 100644 --- a/README.md +++ b/README.md @@ -13,14 +13,7 @@ Current build status ==================== - - - - +
Drone - - linux - -
@@ -163,7 +156,8 @@ conda search blas --channel conda-forge About conda-forge ================= -[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org) +[![Powered by +NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](https://numfocus.org) conda-forge is a community-led conda channel of installable packages. In order to provide high-quality builds, the process has been automated into the diff --git a/build-locally.py b/build-locally.py index 00eeb34b..8b743489 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: @@ -21,6 +22,10 @@ def setup_environment(ns): os.environ["MINIFORGE_HOME"] = os.path.join( os.path.dirname(__file__), "miniforge3" ) + if "OSX_SDK_DIR" not in os.environ: + os.environ["OSX_SDK_DIR"] = os.path.join( + os.path.dirname(__file__), "SDKs" + ) def run_docker_build(ns):
Azure