Merge branch 'main' into cross-python

Author: beckermr

conda-lock.yml

@@ -701,47 +701,47 @@ package:
       python-dateutil: '>=2.1,<3.0.0'
       urllib3: '>=1.25.4,!=2.2.0,<3'
     hash:
-      md5: 2d2150ea873387c525a28755c976291f
-      sha256: f814c6cd184bf7526ef1770fc3e5c33d5f4c4867991d5b2713323599d7911f16
+      md5: 197f85e572eb35418f60f85ad0a211e7
+      sha256: 1843a8bdf37d220beed37764b550922fd737838253b32f068fa718c35c7223e4
     manager: conda
     name: botocore
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/botocore-1.37.18-pyge310_1234567_0.conda
-    version: 1.37.18
+      https://conda.anaconda.org/conda-forge/noarch/botocore-1.37.19-pyge310_1234567_0.conda
+    version: 1.37.19
   - category: main
     dependencies:
       jmespath: '>=0.7.1,<2.0.0'
       python: '>=3.10'
       python-dateutil: '>=2.1,<3.0.0'
       urllib3: '>=1.25.4,!=2.2.0,<3'
     hash:
-      md5: 2d2150ea873387c525a28755c976291f
-      sha256: f814c6cd184bf7526ef1770fc3e5c33d5f4c4867991d5b2713323599d7911f16
+      md5: 197f85e572eb35418f60f85ad0a211e7
+      sha256: 1843a8bdf37d220beed37764b550922fd737838253b32f068fa718c35c7223e4
     manager: conda
     name: botocore
     optional: false
     platform: osx-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/botocore-1.37.18-pyge310_1234567_0.conda
-    version: 1.37.18
+      https://conda.anaconda.org/conda-forge/noarch/botocore-1.37.19-pyge310_1234567_0.conda
+    version: 1.37.19
   - category: main
     dependencies:
       jmespath: '>=0.7.1,<2.0.0'
       python: '>=3.10'
       python-dateutil: '>=2.1,<3.0.0'
       urllib3: '>=1.25.4,!=2.2.0,<3'
     hash:
-      md5: 2d2150ea873387c525a28755c976291f
-      sha256: f814c6cd184bf7526ef1770fc3e5c33d5f4c4867991d5b2713323599d7911f16
+      md5: 197f85e572eb35418f60f85ad0a211e7
+      sha256: 1843a8bdf37d220beed37764b550922fd737838253b32f068fa718c35c7223e4
     manager: conda
     name: botocore
     optional: false
     platform: osx-arm64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/botocore-1.37.18-pyge310_1234567_0.conda
-    version: 1.37.18
+      https://conda.anaconda.org/conda-forge/noarch/botocore-1.37.19-pyge310_1234567_0.conda
+    version: 1.37.19
   - category: main
     dependencies:
       __glibc: '>=2.17,<3.0.a0'
@@ -2104,39 +2104,39 @@ package:
   - category: main
     dependencies: {}
     hash:
-      md5: 949519bf61c21c9db15f19f67a08a5b9
-      sha256: 54cbf4a99778316e05a7c646a92681e2694ee104fa637b5f435d4e6a1da818f6
+      md5: 70a927214f86c015bc968a3a9191effd
+      sha256: 6b215f2483afc2e36d01c4cc537a02bf3dcc9c8c6fb1bbd1ec6ac3471cee3435
     manager: conda
     name: conda-forge-pinning
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2025.03.23.21.47.32-hd8ed1ab_0.conda
-    version: 2025.03.23.21.47.32
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2025.03.25.13.35.37-hd8ed1ab_0.conda
+    version: 2025.03.25.13.35.37
   - category: main
     dependencies: {}
     hash:
-      md5: 949519bf61c21c9db15f19f67a08a5b9
-      sha256: 54cbf4a99778316e05a7c646a92681e2694ee104fa637b5f435d4e6a1da818f6
+      md5: 70a927214f86c015bc968a3a9191effd
+      sha256: 6b215f2483afc2e36d01c4cc537a02bf3dcc9c8c6fb1bbd1ec6ac3471cee3435
     manager: conda
     name: conda-forge-pinning
     optional: false
     platform: osx-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2025.03.23.21.47.32-hd8ed1ab_0.conda
-    version: 2025.03.23.21.47.32
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2025.03.25.13.35.37-hd8ed1ab_0.conda
+    version: 2025.03.25.13.35.37
   - category: main
     dependencies: {}
     hash:
-      md5: 949519bf61c21c9db15f19f67a08a5b9
-      sha256: 54cbf4a99778316e05a7c646a92681e2694ee104fa637b5f435d4e6a1da818f6
+      md5: 70a927214f86c015bc968a3a9191effd
+      sha256: 6b215f2483afc2e36d01c4cc537a02bf3dcc9c8c6fb1bbd1ec6ac3471cee3435
     manager: conda
     name: conda-forge-pinning
     optional: false
     platform: osx-arm64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2025.03.23.21.47.32-hd8ed1ab_0.conda
-    version: 2025.03.23.21.47.32
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2025.03.25.13.35.37-hd8ed1ab_0.conda
+    version: 2025.03.25.13.35.37
   - category: main
     dependencies:
       click: '>=8'
@@ -9183,45 +9183,45 @@ package:
       python: '>=3.11,<3.12.0a0'
       python_abi: 3.11.*
     hash:
-      md5: 19615e39755eac6975671b8a679f7088
-      sha256: 2626f5c211749d1e5632c81d92313677e0c537f1376f397432976379db2dabc4
+      md5: a0b45a3ae748e3cce6409cb12664bf2b
+      sha256: 20ecfaf61224ea92dadb543ee5ca3757e4feff4524c9d6633de908d11f4c5cd4
     manager: conda
     name: orjson
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/linux-64/orjson-3.10.15-py311h9e33e62_0.conda
-    version: 3.10.15
+      https://conda.anaconda.org/conda-forge/linux-64/orjson-3.10.16-py311h9e33e62_0.conda
+    version: 3.10.16
   - category: main
     dependencies:
       __osx: '>=10.13'
       python: '>=3.11,<3.12.0a0'
       python_abi: 3.11.*
     hash:
-      md5: a1b4c1e9c26279ae4dcbd4319dffb541
-      sha256: 0015c2a458bea689eb5af205bc30770ca3c51e68a23aa9ee0ae2f84282ac11b5
+      md5: cb8506609560dbdc5dfc31be0a11f3b5
+      sha256: 02b79f1ab9a745a542fd9fa361890ea1b99764fb91a1637d7a64e5bd9c699c96
     manager: conda
     name: orjson
     optional: false
     platform: osx-64
     url:
-      https://conda.anaconda.org/conda-forge/osx-64/orjson-3.10.15-py311h3b9c2be_0.conda
-    version: 3.10.15
+      https://conda.anaconda.org/conda-forge/osx-64/orjson-3.10.16-py311h3b9c2be_0.conda
+    version: 3.10.16
   - category: main
     dependencies:
       __osx: '>=11.0'
       python: '>=3.11,<3.12.0a0'
       python_abi: 3.11.*
     hash:
-      md5: 1c10494123be62099e1afaa0ea746786
-      sha256: 5f34f758aa88da54af624e5bd8e8f19f0cc36acf3f1792efbd4c59748ffa9b7a
+      md5: 8d735e647d8e06b1e33ecd296070de34
+      sha256: 2f9f6d2541a903ce91f5af8bf31b39d678d7e569c802e73f7c2e2ca91eb763f2
     manager: conda
     name: orjson
     optional: false
     platform: osx-arm64
     url:
-      https://conda.anaconda.org/conda-forge/osx-arm64/orjson-3.10.15-py311h3ff9189_0.conda
-    version: 3.10.15
+      https://conda.anaconda.org/conda-forge/osx-arm64/orjson-3.10.16-py311h3ff9189_0.conda
+    version: 3.10.16
   - category: main
     dependencies:
       python: '>=3.8'

conda_forge_tick/migrators/cross_compile.py

@@ -345,20 +345,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 = []
@@ -367,10 +371,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 = [
@@ -379,15 +393,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:
@@ -396,7 +413,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"):

conda_forge_tick/migrators/recipe_v1.py

@@ -12,56 +12,43 @@
 logger = logging.getLogger(__name__)
 
 
-def combine_conditions(node):
+def is_same_condition(a: Any, b: Any) -> bool:
+    return (
+        isinstance(a, dict)
+        and isinstance(b, dict)
+        and "if" in a
+        and "if" in b
+        and a["if"] == b["if"]
+    )
+
+
+def fold_branch(source: Any, dest: Any, branch: str) -> None:
+    if branch not in source:
+        return
+    source_l = source[branch]
+    if isinstance(source_l, str):
+        source_l = [source_l]
+
+    if branch not in dest:
+        dest[branch] = []
+    elif isinstance(dest[branch], str):
+        dest[branch] = [dest[branch]]
+    dest[branch].extend(source_l)
+
+
+def combine_conditions(node: Any):
     """Breadth first recursive call to combine list conditions"""
 
     # recursion is breadth first because we go through each element here
     # before calling `combine_conditions` on any element in the node
     if isinstance(node, list):
-        # 1. loop through list elements, gather the if conditions
-
-        # condition ("if:") -> [(then, else), (then, else)...]
-        conditions = {}
-
-        for i in node:
-            if isinstance(i, dict) and "if" in i:
-                conditions.setdefault(i["if"], []).append((i["then"], i.get("else")))
-
-        # 2. if elements share a compatible if condition
-        # combine their if...then...else statements
-        to_drop = []
-        for i in range(len(node)):
-            if isinstance(node[i], dict) and "if" in node[i]:
-                condition = node[i]["if"]
-                if condition not in conditions:
-                    # already combined it, so drop the repeat instance
-                    to_drop.append(i)
-                    continue
-                if len(conditions[condition]) > 1:
-                    new_then = []
-                    new_else = []
-                    for sub_then, sub_else in conditions[node[i]["if"]]:
-                        if isinstance(sub_then, list):
-                            new_then.extend(sub_then)
-                        else:
-                            assert sub_then is not None
-                            new_then.append(sub_then)
-                        if isinstance(sub_else, list):
-                            new_else.extend(sub_else)
-                        elif sub_else is not None:
-                            new_else.append(sub_else)
-                    node[i]["then"] = new_then
-                    if new_else:
-                        # TODO: preserve inline "else" instead of converting it to a list?
-                        node[i]["else"] = new_else
-                    else:
-                        assert "else" not in node[i]
-                    # remove it from the dict, so we don't output it again
-                    del conditions[condition]
-
-        # drop the repeated conditions
-        for i in reversed(to_drop):
-            del node[i]
+        # iterate in reverse order, so we can remove elements on the fly
+        # start at index 1, since we can only fold to the previous node
+        for i in reversed(range(1, len(node))):
+            if is_same_condition(node[i], node[i - 1]):
+                fold_branch(node[i], node[i - 1], "then")
+                fold_branch(node[i], node[i - 1], "else")
+                del node[i]
 
     # then we descend down the tree
     if isinstance(node, dict):