Merge pull request #3868 from regro/revert-3867-revert-3851-combine-dep

fix: add mini-replacement migrator back in w/ serialization fixes and tests

Author: beckermr

conda_forge_tick/make_migrators.py

@@ -51,28 +51,26 @@
     GraphMigrator,
     GuardTestingMigrator,
     Jinja2VarsCleanup,
-    JpegTurboMigrator,
     LibboostMigrator,
     LicenseMigrator,
     MigrationYaml,
     Migrator,
     MiniMigrator,
+    MiniReplacement,
     MPIPinRunAsBuildCleanup,
     NoarchPythonMinMigrator,
     NoCondaInspectMigrator,
     Numpy2Migrator,
     PipMigrator,
     PipWheelMigrator,
     PyPIOrgMigrator,
-    QtQtMainMigrator,
     Replacement,
     RUCRTCleanup,
     StaticLibMigrator,
     StdlibMigrator,
     UpdateCMakeArgsMigrator,
     UpdateConfigSubGuessMigrator,
     Version,
-    XzLibLzmaDevelMigrator,
     YAMLRoundTrip,
     make_from_lazy_json_data,
     skip_migrator_due_to_schema,
@@ -376,9 +374,11 @@ def add_rebuild_migration_yaml(
         StdlibMigrator(),
     ]
     if migration_name == "qt515":
-        piggy_back_migrations.append(QtQtMainMigrator())
+        piggy_back_migrations.append(MiniReplacement(old_pkg="qt", new_pkg="qt-main"))
     if migration_name == "jpeg_to_libjpeg_turbo":
-        piggy_back_migrations.append(JpegTurboMigrator())
+        piggy_back_migrations.append(
+            MiniReplacement(old_pkg="jpeg", new_pkg="libjpeg-turbo")
+        )
     if migration_name == "boost_cpp_to_libboost":
         piggy_back_migrations.append(LibboostMigrator())
     if migration_name == "numpy2":
@@ -388,7 +388,9 @@ def add_rebuild_migration_yaml(
     if migration_name.startswith("flang19"):
         piggy_back_migrations.append(FlangMigrator())
     if migration_name.startswith("xz_to_liblzma_devel"):
-        piggy_back_migrations.append(XzLibLzmaDevelMigrator())
+        piggy_back_migrations.append(
+            MiniReplacement(old_pkg="xz", new_pkg="liblzma-devel")
+        )
     piggy_back_migrations = _make_mini_migrators_with_defaults(
         extra_mini_migrators=piggy_back_migrations
     )

conda_forge_tick/migrators/__init__.py

@@ -26,7 +26,6 @@
 from .extra_jinj2a_keys_cleanup import ExtraJinja2KeysCleanup
 from .flang import FlangMigrator
 from .jinja2_vars_cleanup import Jinja2VarsCleanup
-from .jpegturbo import JpegTurboMigrator
 from .libboost import LibboostMigrator
 from .license import LicenseMigrator
 from .matplotlib_base import MatplotlibBase
@@ -36,12 +35,10 @@
 from .pip_check import PipCheckMigrator
 from .pip_wheel_dep import PipWheelMigrator
 from .pypi_org import PyPIOrgMigrator
-from .qt_to_qt_main import QtQtMainMigrator
 from .r_ucrt import RUCRTCleanup
-from .replacement import Replacement
+from .replacement import Replacement, MiniReplacement
 from .use_pip import PipMigrator
 from .version import Version
-from .xz_to_liblzma_devel import XzLibLzmaDevelMigrator
 from .noarch_python_min import NoarchPythonMinMigrator
 from .round_trip import YAMLRoundTrip
 from .staticlib import StaticLibMigrator

conda_forge_tick/migrators/jpegturbo.py

@@ -2,12 +2,14 @@
 import os
 import re
 import typing
+from pathlib import Path
 from typing import Any
 
 import networkx as nx
 
 from conda_forge_tick.contexts import ClonedFeedstockContext, FeedstockContext
-from conda_forge_tick.migrators.core import Migrator
+from conda_forge_tick.migrators.core import Migrator, MiniMigrator
+from conda_forge_tick.os_utils import pushd
 
 if typing.TYPE_CHECKING:
     from ..migrators_types import AttrsTypedDict, MigrationUidTypedDict, PackageName
@@ -147,3 +149,59 @@ def migrator_uid(self, attrs: "AttrsTypedDict") -> "MigrationUidTypedDict":
         n = super().migrator_uid(attrs)
         n["name"] = self.name
         return n
+
+
+class MiniReplacement(MiniMigrator):
+    """Minimigrator for replacing one package with another.
+
+    Parameters
+    ----------
+    old_pkg : str
+        The package to be replaced.
+    new_pkg : str
+        The package to replace the `old_pkg`.
+    """
+
+    allowed_schema_versions = [0, 1]
+
+    def __init__(
+        self,
+        *,
+        old_pkg: "PackageName",
+        new_pkg: "PackageName",
+        requirement_types: tuple[str] = ("host",),
+    ):
+        if not hasattr(self, "_init_args"):
+            self._init_args = []
+
+        if not hasattr(self, "_init_kwargs"):
+            self._init_kwargs = {
+                "old_pkg": old_pkg,
+                "new_pkg": new_pkg,
+                "requirement_types": requirement_types,
+            }
+
+        super().__init__()
+        self.old_pkg = old_pkg
+        self.new_pkg = new_pkg
+        self.packages = {self.old_pkg}
+        self.requirement_types = requirement_types
+
+    def filter(self, attrs: "AttrsTypedDict", not_bad_str_start: str = "") -> bool:
+        requirements = attrs.get("requirements", {})
+        rq = set()
+        for req_type in self.requirement_types:
+            rq |= requirements.get(req_type, set())
+        return super().filter(attrs) or len(rq & self.packages) == 0
+
+    def migrate(self, recipe_dir: str, attrs: "AttrsTypedDict", **kwargs: Any):
+        with pushd(recipe_dir):
+            recipe_file = Path(
+                next(filter(os.path.exists, ("recipe.yaml", "meta.yaml")))
+            )
+            raw = recipe_file.read_text()
+            upd = raw.replace(f" {self.old_pkg} ", f" {self.new_pkg} ").replace(
+                f" {self.old_pkg}\n", f" {self.new_pkg}\n"
+            )
+
+            recipe_file.write_text(upd)

conda_forge_tick/migrators/qt_to_qt_main.py

@@ -51,6 +51,7 @@ def test_migrator_to_json_minimigrators_nodeps():
             and issubclass(migrator, conda_forge_tick.migrators.MiniMigrator)
             and migrator != conda_forge_tick.migrators.MiniMigrator
             and migrator != conda_forge_tick.migrators.DependencyUpdateMigrator
+            and migrator != conda_forge_tick.migrators.MiniReplacement
         ):
             migrator = migrator()
             data = migrator.to_lazy_json_data()
@@ -79,6 +80,7 @@ def test_migrator_to_json_version():
             conda_forge_tick.migrators.DependencyUpdateMigrator(["blah2"]),
             conda_forge_tick.migrators.LibboostMigrator(),
             conda_forge_tick.migrators.DuplicateLinesCleanup(),
+            conda_forge_tick.migrators.MiniReplacement(old_pkg="foo", new_pkg="bar"),
         ],
     )
     data = migrator.to_lazy_json_data()