Merge pull request #2 from regro-cf-autotick-bot/rebuild-r_base43-0-1…

…_hed2f2d Rebuild for r-base 4.3
conda-forge · Jun 16, 2023 · 8a20f9f · 8a20f9f
2 parents a580286 + 5723127
commit 8a20f9f
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 50 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_r_base4.2.yaml b/.ci_support/linux_64_r_base4.2.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -13,7 +13,7 @@ cran_mirror:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:

diff --git a/.ci_support/linux_64_r_base4.1.yaml → .ci_support/linux_64_r_base4.3.yaml b/.ci_support/linux_64_r_base4.1.yaml → .ci_support/linux_64_r_base4.3.yaml
@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -13,15 +13,15 @@ cran_mirror:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '12'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 pin_run_as_build:
   r-base:
     min_pin: x.x
     max_pin: x.x
 r_base:
-- '4.1'
+- '4.3'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/.ci_support/migrations/r-base42.yaml b/.ci_support/migrations/r-base42.yaml
diff --git a/.ci_support/migrations/r_base43.yaml 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/.ci_support/osx_64_r_base4.2.yaml b/.ci_support/osx_64_r_base4.2.yaml
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -13,7 +13,7 @@ cran_mirror:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:

diff --git a/.ci_support/osx_64_r_base4.1.yaml → .ci_support/osx_64_r_base4.3.yaml b/.ci_support/osx_64_r_base4.1.yaml → .ci_support/osx_64_r_base4.3.yaml
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -13,15 +13,15 @@ cran_mirror:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '14'
+- '15'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 pin_run_as_build:
   r-base:
     min_pin: x.x
     max_pin: x.x
 r_base:
-- '4.1'
+- '4.3'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -1,6 +1,6 @@
+conda_build:
+  pkg_format: '2'
 conda_forge_output_validation: true
 github:
   branch_name: main
   tooling_branch_name: main
-conda_build:
-  pkg_format: '2'
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -15,7 +15,7 @@ source:
 
 build:
   merge_build_host: True  # [win]
-  number: 1
+  number: 2
   rpaths:
     - lib/R/lib/
     - lib/