Merge pull request #1655 from h-vetinari/plat_restrict

conda_forge_tick/feedstock_parser.py

@@ -221,7 +221,7 @@ def populate_feedstock_attributes(
             ci_support_files = glob.glob(
                 os.path.join(feedstock_dir, ".ci_support", "*.yaml"),
             )
-            varient_yamls = []
+            variant_yamls = []
             plat_arch = []
             for cbc_path in ci_support_files:
                 LOGGER.debug("parsing conda-build config: %s", cbc_path)
@@ -242,7 +242,7 @@ def populate_feedstock_attributes(
                         break
                 plat_arch.append((plat, arch))
 
-                varient_yamls.append(
+                variant_yamls.append(
                     parse_meta_yaml(
                         meta_yaml,
                         platform=plat,
@@ -259,41 +259,41 @@ def populate_feedstock_attributes(
                 # sometimes the requirements come out to None or [None]
                 # and this ruins the aggregated meta_yaml / breaks stuff
                 LOGGER.debug("getting reqs for config: %s", cbc_path)
-                if "requirements" in varient_yamls[-1]:
-                    varient_yamls[-1]["requirements"] = _clean_req_nones(
-                        varient_yamls[-1]["requirements"],
+                if "requirements" in variant_yamls[-1]:
+                    variant_yamls[-1]["requirements"] = _clean_req_nones(
+                        variant_yamls[-1]["requirements"],
                     )
-                if "outputs" in varient_yamls[-1]:
-                    for iout in range(len(varient_yamls[-1]["outputs"])):
-                        if "requirements" in varient_yamls[-1]["outputs"][iout]:
-                            varient_yamls[-1]["outputs"][iout][
+                if "outputs" in variant_yamls[-1]:
+                    for iout in range(len(variant_yamls[-1]["outputs"])):
+                        if "requirements" in variant_yamls[-1]["outputs"][iout]:
+                            variant_yamls[-1]["outputs"][iout][
                                 "requirements"
                             ] = _clean_req_nones(
-                                varient_yamls[-1]["outputs"][iout]["requirements"],
+                                variant_yamls[-1]["outputs"][iout]["requirements"],
                             )
 
                 # collapse them down
                 LOGGER.debug("collapsing reqs for config: %s", cbc_path)
                 final_cfgs = {}
-                for plat_arch, varyml in zip(plat_arch, varient_yamls):
+                for plat_arch, varyml in zip(plat_arch, variant_yamls):
                     if plat_arch not in final_cfgs:
                         final_cfgs[plat_arch] = []
                     final_cfgs[plat_arch].append(varyml)
                 for k in final_cfgs:
                     ymls = final_cfgs[k]
                     final_cfgs[k] = _convert_to_dict(ChainDB(*ymls))
                 plat_arch = []
-                varient_yamls = []
+                variant_yamls = []
                 for k, v in final_cfgs.items():
                     plat_arch.append(k)
-                    varient_yamls.append(v)
+                    variant_yamls.append(v)
         else:
             LOGGER.debug("doing generic parsing")
             plat_arch = [("win", "64"), ("osx", "64"), ("linux", "64")]
             for k in set(sub_graph["conda-forge.yml"].get("provider", {})):
                 if "_" in k:
                     plat_arch.append(tuple(k.split("_")))
-            varient_yamls = [
+            variant_yamls = [
                 parse_meta_yaml(meta_yaml, platform=plat, arch=arch)
                 for plat, arch in plat_arch
             ]
@@ -305,10 +305,11 @@ def populate_feedstock_attributes(
         raise
 
     LOGGER.debug("platforms: %s", plat_arch)
+    sub_graph["platforms"] = ["_".join(k) for k in plat_arch]
 
     # this makes certain that we have consistent ordering
-    sorted_varient_yamls = [x for _, x in sorted(zip(plat_arch, varient_yamls))]
-    yaml_dict = ChainDB(*sorted_varient_yamls)
+    sorted_variant_yamls = [x for _, x in sorted(zip(plat_arch, variant_yamls))]
+    yaml_dict = ChainDB(*sorted_variant_yamls)
     if not yaml_dict:
         LOGGER.error(f"Something odd happened when parsing recipe {name}")
         sub_graph["parsing_error"] = "make_graph: Could not parse"
@@ -317,7 +318,7 @@ def populate_feedstock_attributes(
     sub_graph["meta_yaml"] = _convert_to_dict(yaml_dict)
     meta_yaml = sub_graph["meta_yaml"]
 
-    for k, v in zip(plat_arch, varient_yamls):
+    for k, v in zip(plat_arch, variant_yamls):
         plat_arch_name = "_".join(k)
         sub_graph[f"{plat_arch_name}_meta_yaml"] = v
         _, sub_graph[f"{plat_arch_name}_requirements"], _ = _extract_requirements(v)

conda_forge_tick/migrators/migration_yaml.py

@@ -176,10 +176,27 @@ def __init__(
         self.max_solver_attempts = max_solver_attempts
 
     def filter(self, attrs: "AttrsTypedDict", not_bad_str_start: str = "") -> bool:
-        wait_for_migrators = self.loaded_yaml.get("__migrator", {}).get(
-            "wait_for_migrators",
-            [],
-        )
+        """
+        Determine whether migrator needs to be filtered out.
+
+        Return value of True means to skip migrator, False means to go ahead.
+        Calls up the MRO until Migrator.filter, see docstring there (./core.py).
+        """
+        migrator_payload = self.loaded_yaml.get("__migrator", {})
+        platform_allowlist = migrator_payload.get("platform_allowlist", [])
+        wait_for_migrators = migrator_payload.get("wait_for_migrators", [])
+
+        platform_filtered = False
+        if platform_allowlist:
+            # migrator.platform_allowlist allows both styles: "osx-64" & "osx_64";
+            # before comparison, normalize to consistently use underscores (we get
+            # "_" in attrs.platforms from the feedstock_parser)
+            platform_allowlist = [x.replace("-", "_") for x in platform_allowlist]
+            # filter out nodes where the intersection between
+            # attrs.platforms and platform_allowlist is empty
+            intersection = set(attrs.get("platforms", {})) & set(platform_allowlist)
+            platform_filtered = not bool(intersection)
+
         need_to_wait = False
         if wait_for_migrators:
             found_migrators = set()
@@ -199,9 +216,13 @@ def filter(self, attrs: "AttrsTypedDict", not_bad_str_start: str = "") -> bool:
             wait_for_migrators,
         )
 
-        return need_to_wait or super().filter(
-            attrs=attrs,
-            not_bad_str_start=not_bad_str_start,
+        return (
+            platform_filtered
+            or need_to_wait
+            or super().filter(
+                attrs=attrs,
+                not_bad_str_start=not_bad_str_start,
+            )
         )
 
     def migrate(

conda_forge_tick/migrators_types.pyi

@@ -111,6 +111,7 @@ class AttrsTypedDict_(TypedDict, total=False):
     package: PackageTypedDict
     raw_meta_yaml: str
     req: Set[str]
+    platforms: List[str]
     requirements: RequirementsTypedDict
     source: SourceTypedDict
     test: TestTypedDict