Merge pull request #10 from regro-cf-autotick-bot/rebuild-r-base44_an…

…d_m2w64-ucrt-0-1_h96d052 Rebuild for r-base 4.4 and UCRT mingw toolchain
conda-forge · Jul 26, 2024 · 196070e · 196070e
2 parents 6f8fa27 + 47cf8bb
commit 196070e
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 44 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.ci_support/linux_64_r_base4.3.yaml b/.ci_support/linux_64_r_base4.3.yaml
@@ -1,5 +1,5 @@
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/linux_64_r_base4.2.yaml → .ci_support/linux_64_r_base4.4.yaml b/.ci_support/linux_64_r_base4.2.yaml → .ci_support/linux_64_r_base4.4.yaml
@@ -1,5 +1,5 @@
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -11,4 +11,4 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 r_base:
-- '4.2'
+- '4.4'
diff --git a/.ci_support/migrations/r-base44_and_m2w64-ucrt.yaml b/.ci_support/migrations/r-base44_and_m2w64-ucrt.yaml
@@ -0,0 +1,50 @@
+migrator_ts: 1718391654
+__migrator:
+  kind: version
+  migration_number: 1
+  bump_number: 1
+  commit_message: "Rebuild for r-base 4.4 and UCRT mingw toolchain"
+  primary_key: r_base
+  automerge: True
+  longterm: True
+  include_noarch: True
+  pr_limit: 40
+  override_cbc_keys:
+    - r-base
+    - r_base
+    - m2w64_c_compiler_stub
+    - m2w64_cxx_compiler_stub
+    - m2w64_fortran_compiler_stub
+  ordering:
+    m2w64_c_compiler:
+      - m2w64-toolchain
+      - gcc
+    m2w64_cxx_compiler:
+      - m2w64-toolchain
+      - gxx
+    m2w64_fortran_compiler:
+      - m2w64-toolchain
+      - gfortran
+    m2w64_c_stdlib:
+      - m2w64-toolchain
+      - m2w64-sysroot
+
+r_base:
+  - 4.3
+  - 4.4
+m2w64_c_compiler:                 # [win]
+  - gcc                           # [win]
+m2w64_c_compiler_version:         # [win]
+  - 13                            # [win]
+m2w64_cxx_compiler:               # [win]
+  - gxx                           # [win]
+m2w64_cxx_compiler_version:       # [win]
+  - 13                            # [win]
+m2w64_fortran_compiler:           # [win]
+  - gfortran                      # [win]
+m2w64_fortran_compiler_version:   # [win]
+  - 13                            # [win]
+m2w64_c_stdlib:                   # [win]
+  - m2w64-sysroot                 # [win]
+m2w64_c_stdlib_version:           # [win]
+  - 12                            # [win]
diff --git a/.ci_support/migrations/r_base43.yaml b/.ci_support/migrations/r_base43.yaml
diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,35 +1,26 @@
 {% set version = '4.0.0' %}
-
 {% set posix = 'm2-' if win else '' %}
-{% set native = 'm2w64-' if win else '' %}
 
 package:
   name: r-nasaaccess
   version: {{ version|replace("-", "_") }}
 
 source:
-
   url: https://github.com/nasa/NASAaccess/archive/v{{ version }}.tar.gz
   sha256: 8f3b2616c0436ac9567f762c8a8efc6603fae99887c9df04ecd551eb2d201e06
 
 build:
-  merge_build_host: True  # [win]
-
-  number: 1
-
+  number: 2
   noarch: generic
-
   rpaths:
     - lib/R/lib/
     - lib/
 
-
 requirements:
   build:
     - {{ posix }}filesystem        # [win]
     - {{ posix }}git
     - {{ posix }}zip               # [win]
-
   host:
     - r-base
     - r-xml
@@ -38,7 +29,6 @@ requirements:
     - r-ncdf4
     - r-stringr
     - r-terra
-
   run:
     - r-base
     - r-xml
@@ -50,7 +40,6 @@ requirements:
 
 test:
   commands:
-
     - $R -e "library('NASAaccess')"           # [not win]
     - "\"%R%\" -e \"library('NASAaccess')\""  # [win]
 
@@ -74,7 +63,6 @@ about:
   doc_url: https://imohamme.github.io/NASAaccess/
   dev_url: https://github.com/imohamme/NASAaccess
 
-
 extra:
   recipe-maintainers:
     - conda-forge/r