diff --git a/conda_forge_tick/migrators/r_ucrt.py b/conda_forge_tick/migrators/r_ucrt.py index 1b69844cf..0435a8557 100644 --- a/conda_forge_tick/migrators/r_ucrt.py +++ b/conda_forge_tick/migrators/r_ucrt.py @@ -16,13 +16,13 @@ def _cleanup_raw_yaml(raw_yaml): line = line.replace("{{native}}", "") line = line.replace("{{posix}}pkg-config", "pkg-config") line = line.replace("{{ posix }}pkg-config", "pkg-config") + line = line.replace("- m2w64-pkg-config", "pkg-config") line = line.replace("- m2w64-toolchain", "- {{ compiler('m2w64_c') }}") + line = line.replace("- posix", "- m2-base") if "merge_build_host: " in line: continue if "- gcc-libs" in line: continue - if "- posix" in line: - continue if "set native =" in line: continue if re.search(r"\s*skip: (T|t)rue\s+\# \[win\]", line): @@ -44,7 +44,10 @@ class RUCRTCleanup(MiniMigrator): """Cleanup the R recipes for ucrt""" def filter(self, attrs: "AttrsTypedDict", not_bad_str_start: str = "") -> bool: - return "native" not in attrs.get("raw_meta_yaml", "") + return not any( + w in attrs.get("raw_meta_yaml", "") + for w in ["native", "- posix", "- m2w64"] + ) def migrate(self, recipe_dir: str, attrs: "AttrsTypedDict", **kwargs: Any) -> None: with pushd(recipe_dir):