From b446d8b4edb3d72ac1ee9acf2d2f5de43c0f4090 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 19:50:14 +0000 Subject: [PATCH 1/2] Rebuild for libdeflate 1.21 --- .ci_support/migrations/libdeflate121.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libdeflate121.yaml diff --git a/.ci_support/migrations/libdeflate121.yaml b/.ci_support/migrations/libdeflate121.yaml new file mode 100644 index 00000000..9107cab3 --- /dev/null +++ b/.ci_support/migrations/libdeflate121.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libdeflate 1.21 + kind: version + migration_number: 1 +libdeflate: +- '1.21' +migrator_ts: 1722836748.1931596 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6be4248c..7fdcaf32 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -27,7 +27,7 @@ source: - 0018-Fix-path-to-TCL-TK.patch build: - number: 14 + number: 15 no_link: - lib/R/doc/html/packages.html From 9b3a2470a6fcba253fac738ce8e59ebefc90aa15 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 19:51:06 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.37.2, and conda-forge-pinning 2024.08.05.15.28.08 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_aarch64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- .scripts/run_osx_build.sh | 2 +- README.md | 2 +- build-locally.py | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 8be59069..ae079344 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -25,7 +25,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 7df3c498..af229bad 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -37,7 +37,7 @@ libblas: libcurl: - '8' libdeflate: -- '1.20' +- '1.21' libiconv: - '1' libjpeg_turbo: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 880a8873..90bb85b1 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -41,7 +41,7 @@ libblas: libcurl: - '8' libdeflate: -- '1.20' +- '1.21' libiconv: - '1' libjpeg_turbo: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 5fbac35d..21589889 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -37,7 +37,7 @@ libblas: libcurl: - '8' libdeflate: -- '1.20' +- '1.21' libiconv: - '1' libjpeg_turbo: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 6ebc12a2..9c697bac 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -39,7 +39,7 @@ libblas: libcurl: - '8' libdeflate: -- '1.20' +- '1.21' libiconv: - '1' libjpeg_turbo: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 4fa892b8..b2237519 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -39,7 +39,7 @@ libblas: libcurl: - '8' libdeflate: -- '1.20' +- '1.21' libiconv: - '1' libjpeg_turbo: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index a23d4a11..47ec2358 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -33,7 +33,7 @@ libblas: libcurl: - '8' libdeflate: -- '1.20' +- '1.21' libiconv: - '1' libjpeg_turbo: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index ba0c8791..420f051c 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/README.md b/README.md index 5077d5da..bd57464d 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== -* [@conda-forge/r](https://github.com/conda-forge/r/) +* [@conda-forge/r](https://github.com/orgs/conda-forge/teams/r/) * [@isuruf](https://github.com/isuruf/) * [@mbargull](https://github.com/mbargull/) * [@mingwandroid](https://github.com/mingwandroid/) diff --git a/build-locally.py b/build-locally.py index e0d408d0..d78427b5 100755 --- a/build-locally.py +++ b/build-locally.py @@ -3,11 +3,11 @@ # This file has been generated by conda-smithy in order to build the recipe # locally. # -import os import glob +import os +import platform import subprocess from argparse import ArgumentParser -import platform def setup_environment(ns):