From d45374253500c58f59c201772a39d9d17f8f456d Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 4 Dec 2022 20:49:53 +1100 Subject: [PATCH] MNT: Re-rendered with conda-build 3.23.2, conda-smithy 3.22.0, and conda-forge-pinning 2022.12.02.15.22.41 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/migrations/r-base42.yaml | 15 --------------- .circleci/config.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 5 ++--- README.md | 18 +++++++++--------- 6 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 .ci_support/migrations/r-base42.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8a0bcae..13e526a 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -35,7 +35,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/migrations/r-base42.yaml b/.ci_support/migrations/r-base42.yaml deleted file mode 100644 index 78710da..0000000 --- a/.ci_support/migrations/r-base42.yaml +++ /dev/null @@ -1,15 +0,0 @@ -migrator_ts: 1661453785 -__migrator: - kind: version - migration_number: 1 - bump_number: 1 - operation: key_add - commit_message: "Rebuild for r-base 4.2" - primary_key: r_base - automerge: True - longterm: True - include_noarch: True - pr_limit: 20 - -r_base: # [not win] - - 4.2 # [not win] diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e61aa2..8b4ef2f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ # 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 -*- +# -*- mode: jinja-yaml -*- version: 2 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a6b09f6..84431a6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 736a39a..b3abaeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,10 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" diff --git a/README.md b/README.md index b6af31e..6e9be55 100644 --- a/README.md +++ b/README.md @@ -30,63 +30,63 @@ Current build status linux_64_r_base4.1 - variant + variant linux_64_r_base4.2 - variant + variant linux_aarch64_r_base4.1 - variant + variant linux_aarch64_r_base4.2 - variant + variant osx_64_r_base4.1 - variant + variant osx_64_r_base4.2 - variant + variant osx_arm64_r_base4.1 - variant + variant osx_arm64_r_base4.2 - variant + variant win_64 - variant + variant