Remove the old get_build_setup() API

Remove the `get_build_setup()` API.  We need to replace it with
something more flexible.  I'm going to prototype it directly between
the plugins and numpy first, and see how that works out.

Author: mgorny

tests/mocked_plugins.py

@@ -39,19 +39,6 @@ def get_supported_configs(
             VariantFeatureConfig("name2", ["val2a", "val2b", "val2c"]),
         ]
 
-    def get_build_setup(
-        self, properties: frozenset[VariantPropertyType]
-    ) -> dict[str, list[str]]:
-        for prop in properties:
-            assert prop.namespace == self.namespace
-            if prop.feature == "name1":
-                return {
-                    "cflags": [f"-march={prop.value}"],
-                    "cxxflags": [f"-march={prop.value}"],
-                    "ldflags": ["-Wl,--test-flag"],
-                }
-        return {}
-
 
 MyVariantFeatureConfig = namedtuple("MyVariantFeatureConfig", ("name", "values"))
 
@@ -108,21 +95,6 @@ def get_supported_configs(
         assert known_properties is None
         return []
 
-    def get_build_setup(
-        self, properties: frozenset[VariantPropertyType]
-    ) -> dict[str, list[str]]:
-        flag_opts = []
-
-        for prop in properties:
-            assert prop.namespace == self.namespace
-            assert prop.value == "on"
-            flag_opts.append(f"-m{prop.feature}")
-
-        return {
-            "cflags": flag_opts,
-            "cxxflags": flag_opts,
-        }
-
 
 class IndirectPath:
     class MoreIndirection:

tests/plugins/test_loader.py

@@ -16,11 +16,9 @@
 from variantlib.constants import VARIANT_INFO_PROVIDER_PLUGIN_API_KEY
 from variantlib.constants import VARIANTS_JSON_VARIANT_DATA_KEY
 from variantlib.errors import PluginError
-from variantlib.errors import PluginMissingError
 from variantlib.errors import ValidationError
 from variantlib.models.provider import ProviderConfig
 from variantlib.models.provider import VariantFeatureConfig
-from variantlib.models.variant import VariantDescription
 from variantlib.models.variant import VariantProperty
 from variantlib.models.variant import VariantValidationResult
 from variantlib.models.variant_info import ProviderInfo
@@ -338,46 +336,6 @@ def test_namespace_instantiation_returns_incorrect_type(
         pass
 
 
-def test_get_build_setup(
-    mocked_plugin_loader: BasePluginLoader,
-) -> None:
-    variant_desc = VariantDescription(
-        [
-            VariantProperty("test_namespace", "name1", "val1b"),
-            VariantProperty("second_namespace", "name3", "val3c"),
-            VariantProperty("incompatible_namespace", "flag1", "on"),
-            VariantProperty("incompatible_namespace", "flag4", "on"),
-        ]
-    )
-
-    # flag order may depend on (random) property ordering
-    assert {
-        k: sorted(v)
-        for k, v in mocked_plugin_loader.get_build_setup(variant_desc).items()
-    } == {
-        "cflags": ["-march=val1b", "-mflag1", "-mflag4"],
-        "cxxflags": ["-march=val1b", "-mflag1", "-mflag4"],
-        "ldflags": ["-Wl,--test-flag"],
-    }
-
-
-def test_get_build_setup_missing_plugin(
-    mocked_plugin_loader: BasePluginLoader,
-) -> None:
-    variant_desc = VariantDescription(
-        [
-            VariantProperty("test_namespace", "name1", "val1b"),
-            VariantProperty("missing_plugin", "name", "val"),
-        ]
-    )
-
-    with pytest.raises(
-        PluginMissingError,
-        match=r"No plugin found for namespace 'missing_plugin'",
-    ):
-        assert mocked_plugin_loader.get_build_setup(variant_desc)
-
-
 def test_namespaces(
     mocked_plugin_loader: BasePluginLoader,
 ) -> None:
@@ -588,7 +546,6 @@ def test_empty_plugin_list(loader_call: Callable[[], BasePluginLoader]) -> None:
         assert loader.namespaces == []
         assert loader.get_supported_configs() == {}
         assert loader.validate_properties([]) == VariantValidationResult({})
-        assert loader.get_build_setup(VariantDescription([])) == {}
 
 
 @pytest.mark.parametrize(

variantlib/plugins/_subprocess.py

@@ -158,33 +158,6 @@ def main() -> int:
                 else:
                     results.extend((property_to_dict(vprop), None) for vprop in p_props)
             retval = {command: results}
-        elif command == "get_build_setup":
-            assert command_args
-            assert "properties" in command_args
-            ret_env: dict[str, list[str]] = {}
-            for plugin, p_props in group_properties_by_plugin(
-                command_args["properties"], namespace_map
-            ):
-                if plugin is None:
-                    raise KeyError(
-                        f"No provider for namespace {next(iter(p_props)).namespace}"
-                    )
-                if hasattr(plugin, "get_build_setup"):
-                    plugin_env = plugin.get_build_setup(p_props)
-
-                    try:
-                        validate_type(plugin_env, dict[str, list[str]])
-                    except ValidationError as err:
-                        raise TypeError(
-                            f"Provider {plugin.namespace}, get_build_setup() "
-                            f"method returned incorrect type. {err}"
-                        ) from None
-                else:
-                    plugin_env = {}
-
-                for k, v in plugin_env.items():
-                    ret_env.setdefault(k, []).extend(v)
-            retval = {command: ret_env}
         else:
             raise ValueError(f"Invalid command: {command}")
 

variantlib/plugins/loader.py

@@ -20,7 +20,6 @@
 from variantlib.constants import VALIDATION_PROVIDER_PLUGIN_API_REGEX
 from variantlib.errors import NoPluginFoundError
 from variantlib.errors import PluginError
-from variantlib.errors import PluginMissingError
 from variantlib.models.provider import ProviderConfig
 from variantlib.models.provider import VariantFeatureConfig
 from variantlib.models.variant import VariantProperty
@@ -30,7 +29,6 @@
 if TYPE_CHECKING:
     from types import TracebackType
 
-    from variantlib.models.variant import VariantDescription
     from variantlib.models.variant_info import ProviderInfo
     from variantlib.models.variant_info import VariantInfo
     from variantlib.protocols import VariantNamespace
@@ -239,33 +237,6 @@ def validate_properties(
             {VariantProperty(**vprop): result for vprop, result in results}
         )
 
-    def get_build_setup(self, variant_desc: VariantDescription) -> Any:
-        """Get build variables for a variant made of specified properties"""
-        self._check_plugins_loaded()
-        assert self._namespace_map is not None
-
-        namespaces = {vprop.namespace for vprop in variant_desc.properties}
-        try:
-            plugin_apis = [
-                self.plugin_api_values[namespace] for namespace in namespaces
-            ]
-        except KeyError as err:
-            raise PluginMissingError(f"No plugin found for namespace {err}") from None
-
-        if not plugin_apis:
-            return {}
-
-        return self._call_subprocess(
-            plugin_apis,
-            {
-                "get_build_setup": {
-                    "properties": [
-                        dataclasses.asdict(vprop) for vprop in variant_desc.properties
-                    ]
-                }
-            },
-        )["get_build_setup"]
-
     @property
     def plugin_api_values(self) -> dict[str, str]:
         self._check_plugins_loaded()

variantlib/protocols.py

@@ -113,9 +113,3 @@ def get_supported_configs(
     def validate_property(self, variant_property: VariantPropertyType) -> bool:
         """Validate variant property, returns True if it's valid"""
         raise NotImplementedError
-
-    def get_build_setup(
-        self, properties: frozenset[VariantPropertyType]
-    ) -> dict[str, list[str]]:
-        """Get build variables for a variant made of specified properties"""
-        return {}