From d7351491ca4e780a1388187181e5049393cdd19d Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 16 Jun 2023 00:30:37 +0000 Subject: [PATCH 1/2] Rebuild for r-base 4.3 --- .ci_support/migrations/r_base43.yaml | 17 +++++++++++++++++ conda-forge.yml | 8 ++++---- recipe/meta.yaml | 2 +- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 .ci_support/migrations/r_base43.yaml diff --git a/.ci_support/migrations/r_base43.yaml b/.ci_support/migrations/r_base43.yaml new file mode 100644 index 0000000..ec19ef3 --- /dev/null +++ b/.ci_support/migrations/r_base43.yaml @@ -0,0 +1,17 @@ +migrator_ts: 1682187595 +__migrator: + kind: version + migration_number: 1 + bump_number: 1 + operation: key_add + commit_message: "Rebuild for r-base 4.3" + primary_key: r_base + automerge: True + longterm: True + include_noarch: True + pr_limit: 40 + conda_forge_yml_patches: + provider.win_64: win_disabled + +r_base: + - 4.3 # [not win] diff --git a/conda-forge.yml b/conda-forge.yml index 3004a1c..fb580f7 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,8 @@ -provider: - win: azure +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main -conda_build: - pkg_format: '2' +provider: + win: azure diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3188db6..78439bc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,7 +3,7 @@ package: version: {{ r_base }} build: - number: 1006 + number: 1007 noarch: generic requirements: From 37900521baabd1aeebf04bc95038044d22096b05 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 16 Jun 2023 00:30:46 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.06.15.14.18.49 --- .azure-pipelines/azure-pipelines-linux.yml | 8 ++++---- ..._64_r_base4.1.yaml => linux_64_r_base4.3.yaml} | 2 +- .ci_support/migrations/r-base42.yaml | 15 --------------- .circleci/config.yml | 2 +- README.md | 8 ++++---- 5 files changed, 10 insertions(+), 25 deletions(-) rename .ci_support/{linux_64_r_base4.1.yaml => linux_64_r_base4.3.yaml} (96%) delete mode 100644 .ci_support/migrations/r-base42.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aab0284..cf605a5 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,14 +8,14 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_r_base4.1: - CONFIG: linux_64_r_base4.1 - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_r_base4.2: CONFIG: linux_64_r_base4.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_64_r_base4.3: + CONFIG: linux_64_r_base4.3 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_r_base4.1.yaml b/.ci_support/linux_64_r_base4.3.yaml similarity index 96% rename from .ci_support/linux_64_r_base4.1.yaml rename to .ci_support/linux_64_r_base4.3.yaml index bad9614..91a0f95 100644 --- a/.ci_support/linux_64_r_base4.1.yaml +++ b/.ci_support/linux_64_r_base4.3.yaml @@ -11,4 +11,4 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.1' +- '4.3' diff --git a/.ci_support/migrations/r-base42.yaml b/.ci_support/migrations/r-base42.yaml deleted file mode 100644 index 33aba21..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: 40 - -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/README.md b/README.md index 7598650..26e9d6e 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About r -======= +About r-feedstock +================= + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/r-feedstock/blob/main/LICENSE.txt) Home: http://www.r-project.org/ Package license: GPL-3.0-only -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/r-feedstock/blob/main/LICENSE.txt) - Summary: R is a free software environment for statistical computing and graphics. Current build status