Merge pull request #3836 from mgorny/cross-rbase-v1

beckermr · web-flow · commit 81f946af5da4 · 2025-03-25T14:34:29.000Z
Support v1 recipes in `CrossRBaseMigrator`
diff --git a/conda_forge_tick/migrators/cross_compile.py b/conda_forge_tick/migrators/cross_compile.py
@@ -325,20 +325,24 @@ def migrate(self, recipe_dir: str, attrs: "AttrsTypedDict", **kwargs: Any) -> No
 """
 
 
-class CrossRBaseMigrator(CrossCompilationMigratorBase):
+class CrossRBaseMigrator(MiniMigrator):
+    allowed_schema_versions = {0, 1}
+    post_migration = True
+
     def filter(self, attrs: "AttrsTypedDict", not_bad_str_start: str = "") -> bool:
+        if super().filter(attrs, not_bad_str_start):
+            return True
+
         host_reqs = attrs.get("requirements", {}).get("host", set())
-        skip_schema = skip_migrator_due_to_schema(attrs, self.allowed_schema_versions)
-        if (
-            "r-base" in host_reqs or attrs.get("name", "").startswith("r-")
-        ) and not skip_schema:
+        if "r-base" in host_reqs or attrs.get("name", "").startswith("r-"):
             return False
         else:
             return True
 
     def migrate(self, recipe_dir: str, attrs: "AttrsTypedDict", **kwargs: Any) -> None:
         with pushd(recipe_dir):
-            with open("meta.yaml") as fp:
+            recipe_file = next(filter(os.path.exists, ("recipe.yaml", "meta.yaml")))
+            with open(recipe_file) as fp:
                 meta_yaml = fp.readlines()
 
             new_lines = []
@@ -347,10 +351,20 @@ def migrate(self, recipe_dir: str, attrs: "AttrsTypedDict", **kwargs: Any) -> No
             for line in meta_yaml:
                 if previous_was_build:
                     nspaces = len(line) - len(line.lstrip())
-                    new_lines.append(
-                        " " * nspaces
-                        + "- cross-r-base {{ r_base }}  # [build_platform != target_platform]\n",
-                    )
+                    if recipe_file == "recipe.yaml":
+                        new_lines.extend(
+                            [
+                                " " * nspaces
+                                + "- if: build_platform != host_platform\n",
+                                " " * nspaces + "  then:\n",
+                                " " * nspaces + "    - cross-r-base ${{ r_base }}\n",
+                            ]
+                        )
+                    else:
+                        new_lines.append(
+                            " " * nspaces
+                            + "- cross-r-base {{ r_base }}  # [build_platform != target_platform]\n",
+                        )
                     # Add host R requirements to build
                     host_reqs = attrs.get("requirements", {}).get("host", set())
                     r_host_reqs = [
@@ -359,15 +373,18 @@ def migrate(self, recipe_dir: str, attrs: "AttrsTypedDict", **kwargs: Any) -> No
                         if req.startswith("r-") and req != "r-base"
                     ]
                     for r_req in r_host_reqs:
-                        # Ensure nice formatting
-                        post_nspaces = max(0, 25 - len(r_req))
-                        new_lines.append(
-                            " " * nspaces
-                            + "- "
-                            + r_req
-                            + " " * post_nspaces
-                            + "  # [build_platform != target_platform]\n",
-                        )
+                        if recipe_file == "recipe.yaml":
+                            new_lines.append(" " * nspaces + f"    - {r_req}\n")
+                        else:
+                            # Ensure nice formatting
+                            post_nspaces = max(0, 25 - len(r_req))
+                            new_lines.append(
+                                " " * nspaces
+                                + "- "
+                                + r_req
+                                + " " * post_nspaces
+                                + "  # [build_platform != target_platform]\n",
+                            )
                     in_req = False
                     previous_was_build = False
                 if "requirements:" in line:
@@ -376,7 +393,7 @@ def migrate(self, recipe_dir: str, attrs: "AttrsTypedDict", **kwargs: Any) -> No
                     previous_was_build = True
                 new_lines.append(line)
 
-            with open("meta.yaml", "w") as f:
+            with open(recipe_file, "w") as f:
                 f.write("".join(new_lines))
 
             if os.path.exists("build.sh"):
diff --git a/tests/test_cross_compile.py b/tests/test_cross_compile.py
@@ -149,12 +149,15 @@ def test_cmake(tmp_path):
         assert lines == expected
 
 
+@pytest.mark.parametrize("recipe_version", [0, 1])
 @flaky
-def test_cross_rbase(tmp_path):
+def test_cross_rbase(tmp_path, recipe_version: int):
     run_test_migration(
         m=version_migrator_rbase,
-        inp=YAML_PATH.joinpath("rbase_recipe.yaml").read_text(),
-        output=YAML_PATH.joinpath("rbase_recipe_correct.yaml").read_text(),
+        inp=YAML_PATHS[recipe_version].joinpath("rbase_recipe.yaml").read_text(),
+        output=YAML_PATHS[recipe_version]
+        .joinpath("rbase_recipe_correct.yaml")
+        .read_text(),
         prb="Dependencies have been updated if changed",
         kwargs={"new_version": "2.0.1"},
         mr_out={
@@ -163,18 +166,22 @@ def test_cross_rbase(tmp_path):
             "version": "2.0.1",
         },
         tmp_path=tmp_path,
+        recipe_version=recipe_version,
     )
 
 
+@pytest.mark.parametrize("recipe_version", [0, 1])
 @flaky
-def test_cross_rbase_build_sh(tmp_path):
+def test_cross_rbase_build_sh(tmp_path, recipe_version: int):
     tmp_path.joinpath("recipe").mkdir()
     with open(tmp_path / "recipe/build.sh", "w") as f:
         f.write("#!/bin/bash\nR CMD INSTALL --build .")
     run_test_migration(
         m=version_migrator_rbase,
-        inp=YAML_PATH.joinpath("rbase_recipe.yaml").read_text(),
-        output=YAML_PATH.joinpath("rbase_recipe_correct.yaml").read_text(),
+        inp=YAML_PATHS[recipe_version].joinpath("rbase_recipe.yaml").read_text(),
+        output=YAML_PATHS[recipe_version]
+        .joinpath("rbase_recipe_correct.yaml")
+        .read_text(),
         prb="Dependencies have been updated if changed",
         kwargs={"new_version": "2.0.1"},
         mr_out={
@@ -183,6 +190,7 @@ def test_cross_rbase_build_sh(tmp_path):
             "version": "2.0.1",
         },
         tmp_path=tmp_path,
+        recipe_version=recipe_version,
     )
     expected = [
         "#!/bin/bash\n",
diff --git a/tests/test_v1_yaml/cross_compile/rbase_recipe.yaml b/tests/test_v1_yaml/cross_compile/rbase_recipe.yaml
@@ -0,0 +1,69 @@
+schema_version: 1
+
+context:
+  version: 2.0.0
+  posix: ${{'m2-' if win else ''}}
+  native: ${{'m2w64-' if win else ''}}
+
+package:
+  name: r-magrittr
+  version: ${{ version|replace("-", "_") }}
+
+source:
+  url:
+    - https://cran.r-project.org/src/contrib/magrittr_${{ version }}.tar.gz
+    - https://cran.r-project.org/src/contrib/Archive/magrittr/magrittr_${{ version }}.tar.gz
+  sha256: 05c45943ada9443134caa0ab24db4a962b629f00b755ccf039a2a2a7b2c92ae8
+
+build:
+  number: 1
+  dynamic_linking:
+    rpaths:
+      - lib/R/lib/
+      - lib/
+
+requirements:
+  build:
+    - if: not win
+      then: ${{ compiler('c') }}
+    - if: win
+      then: ${{ compiler('m2w64_c') }}
+    - if: win
+      then: ${{ posix }}filesystem
+    - ${{ posix }}make
+    - if: win
+      then: ${{ posix }}sed
+    - if: win
+      then: ${{ posix }}coreutils
+    - if: win
+      then: ${{ posix }}zip
+  host:
+    - r-base
+    - r-rlang
+  run:
+    - r-base
+    - r-rlang
+    - if: win
+      then: ${{ native }}gcc-libs
+
+tests:
+  - script:
+      - if: not win
+        then: "$R -e \"library('magrittr')\""
+      - if: win
+        then: "\"%R%\" -e \"library('magrittr')\""
+
+about:
+  license: MIT
+  summary: |
+    Provides a mechanism for chaining commands with a new forward-pipe operator, %>%. This operator will forward a value, or the result of an expression, into the next function call/expression. There is flexible support for the type of right-hand side expressions. For more information, see package vignette. To quote
+    Rene Magritte, "Ceci n'est pas un pipe."
+  license_file:
+    - lib/R/share/licenses/MIT
+    - LICENSE
+  homepage: https://magrittr.tidyverse.org
+
+extra:
+  recipe-maintainers:
+    - conda-forge/r
+    - ocefpaf
diff --git a/tests/test_v1_yaml/cross_compile/rbase_recipe_correct.yaml b/tests/test_v1_yaml/cross_compile/rbase_recipe_correct.yaml
@@ -0,0 +1,73 @@
+schema_version: 1
+
+context:
+  version: "2.0.1"
+  posix: ${{'m2-' if win else ''}}
+  native: ${{'m2w64-' if win else ''}}
+
+package:
+  name: r-magrittr
+  version: ${{ version|replace("-", "_") }}
+
+source:
+  url:
+    - https://cran.r-project.org/src/contrib/magrittr_${{ version }}.tar.gz
+    - https://cran.r-project.org/src/contrib/Archive/magrittr/magrittr_${{ version }}.tar.gz
+  sha256: 75c265d51cc2b34beb27040edb09823c7b954d3990a7a931e40690b75d4aad5f
+
+build:
+  number: 0
+  dynamic_linking:
+    rpaths:
+      - lib/R/lib/
+      - lib/
+
+requirements:
+  build:
+    - if: build_platform != host_platform
+      then:
+        - cross-r-base ${{ r_base }}
+        - r-rlang
+    - if: not win
+      then: ${{ compiler('c') }}
+    - if: win
+      then: ${{ compiler('m2w64_c') }}
+    - if: win
+      then: ${{ posix }}filesystem
+    - ${{ posix }}make
+    - if: win
+      then: ${{ posix }}sed
+    - if: win
+      then: ${{ posix }}coreutils
+    - if: win
+      then: ${{ posix }}zip
+  host:
+    - r-base
+    - r-rlang
+  run:
+    - r-base
+    - r-rlang
+    - if: win
+      then: ${{ native }}gcc-libs
+
+tests:
+  - script:
+      - if: not win
+        then: "$R -e \"library('magrittr')\""
+      - if: win
+        then: "\"%R%\" -e \"library('magrittr')\""
+
+about:
+  license: MIT
+  summary: |
+    Provides a mechanism for chaining commands with a new forward-pipe operator, %>%. This operator will forward a value, or the result of an expression, into the next function call/expression. There is flexible support for the type of right-hand side expressions. For more information, see package vignette. To quote
+    Rene Magritte, "Ceci n'est pas un pipe."
+  license_file:
+    - lib/R/share/licenses/MIT
+    - LICENSE
+  homepage: https://magrittr.tidyverse.org
+
+extra:
+  recipe-maintainers:
+    - conda-forge/r
+    - ocefpaf
