Remove auto-install support from PluginLoader

Author: mgorny

tests/plugins/test_loader.py

@@ -446,7 +446,7 @@ def test_load_plugin_invalid_arg() -> None:
     ],
 )
 def test_load_plugins_from_variant_info(variant_info: VariantInfo) -> None:
-    with PluginLoader(variant_info, use_auto_install=False) as loader:
+    with PluginLoader(variant_info) as loader:
         assert set(loader.namespaces) == {"test_namespace", "second_namespace"}
 
 
@@ -474,9 +474,7 @@ def test_plugin_in_venv(test_plugin_package_req: str) -> None:
 
     with DefaultIsolatedEnv() as venv:
         venv.install([test_plugin_package_req])
-        with PluginLoader(
-            variant_info, use_auto_install=False, venv_path=Path(venv.path)
-        ) as loader:
+        with PluginLoader(variant_info, venv_path=Path(venv.path)) as loader:
             assert set(loader.namespaces) == {"installable_plugin"}
 
 
@@ -496,7 +494,7 @@ def test_no_plugin_api(
         },
     )
 
-    with PluginLoader(variant_info, use_auto_install=False) as loader:
+    with PluginLoader(variant_info) as loader:
         assert set(loader.namespaces) == {"installable_plugin"}
 
 
@@ -532,16 +530,14 @@ def test_optional_plugins(value: bool | list[VariantNamespace], expected: bool)
     expected_namespaces = {"test_namespace"}
     if expected:
         expected_namespaces.add("second_namespace")
-    with PluginLoader(
-        variant_info, use_auto_install=False, enable_optional_plugins=value
-    ) as loader:
+    with PluginLoader(variant_info, enable_optional_plugins=value) as loader:
         assert set(loader.namespaces) == expected_namespaces
 
 
 @pytest.mark.parametrize(
     "loader_call",
     [
-        partial(PluginLoader, VariantInfo(), use_auto_install=False),
+        partial(PluginLoader, VariantInfo()),
         partial(ListPluginLoader, []),
     ],
 )
@@ -582,7 +578,5 @@ def test_filter_plugins(value: list[VariantNamespace]) -> None:
 
     expected_namespaces = set(value)
     expected_namespaces.discard("frobnicate")
-    with PluginLoader(
-        variant_info, use_auto_install=False, filter_plugins=value
-    ) as loader:
+    with PluginLoader(variant_info, filter_plugins=value) as loader:
         assert set(loader.namespaces) == expected_namespaces

tests/test_api.py

@@ -119,9 +119,9 @@ def test_get_variant_hashes_by_priority_roundtrip(
 
     # variants_json = VariantsJson(typed_variants_json)
 
-    assert get_variant_hashes_by_priority(
-        variants_json=typed_variants_json, use_auto_install=False, venv_path=None
-    ) == [vdesc.hexdigest for vdesc in combinations]
+    assert get_variant_hashes_by_priority(variants_json=typed_variants_json) == [
+        vdesc.hexdigest for vdesc in combinations
+    ]
 
 
 @settings(deadline=None, suppress_health_check=[HealthCheck.function_scoped_fixture])
@@ -210,9 +210,9 @@ def get_or_skip_combinations() -> Generator[VariantDescription]:
         "variantlib.plugins.loader.BasePluginLoader.get_supported_configs"
     ).return_value = {provider_cfg.namespace: provider_cfg for provider_cfg in configs}
 
-    assert get_variant_hashes_by_priority(
-        variants_json=typed_variants_json, use_auto_install=False, venv_path=None
-    ) == [vdesc.hexdigest for vdesc in combinations]
+    assert get_variant_hashes_by_priority(variants_json=typed_variants_json) == [
+        vdesc.hexdigest for vdesc in combinations
+    ]
 
 
 @pytest.mark.parametrize(
@@ -306,7 +306,6 @@ def test_validate_variant(mocked_plugin_apis: list[str], optional: bool) -> None
             ]
         ),
         variant_info=variant_info,
-        use_auto_install=False,
     )
 
     assert res == VariantValidationResult(
@@ -452,12 +451,7 @@ def test_check_variant_supported_dist(
 ) -> None:
     variant_json = VariantsJson(common_variant_info)
     variant_json.variants[vdesc.hexdigest] = vdesc
-    assert (
-        check_variant_supported(
-            variant_info=variant_json, use_auto_install=False, venv_path=None
-        )
-        is expected
-    )
+    assert check_variant_supported(variant_info=variant_json) is expected
 
 
 def test_check_variant_supported_generic() -> None:
@@ -478,8 +472,6 @@ def test_check_variant_supported_generic() -> None:
     assert check_variant_supported(
         vdesc=VariantDescription(),
         variant_info=variant_info,
-        use_auto_install=False,
-        venv_path=None,
     )
 
     # test a supported variant
@@ -491,16 +483,12 @@ def test_check_variant_supported_generic() -> None:
             ]
         ),
         variant_info=variant_info,
-        use_auto_install=False,
-        venv_path=None,
     )
 
     # test an usupported variant
     assert not check_variant_supported(
         vdesc=VariantDescription([VariantProperty("test_namespace", "name1", "val1c")]),
         variant_info=variant_info,
-        use_auto_install=False,
-        venv_path=None,
     )
 
 

variantlib/api.py

@@ -47,8 +47,6 @@
 def get_variant_hashes_by_priority(
     *,
     variants_json: VariantsJsonDict | VariantsJson,
-    use_auto_install: bool = True,
-    isolated: bool = True,
     venv_path: str | pathlib.Path | None = None,
     enable_optional_plugins: bool | list[VariantNamespace] = False,
 ) -> list[str]:
@@ -60,8 +58,6 @@ def get_variant_hashes_by_priority(
 
     with PluginLoader(
         variant_info=variants_json,
-        use_auto_install=use_auto_install,
-        isolated=isolated,
         venv_path=venv_path,
         enable_optional_plugins=enable_optional_plugins,
     ) as plugin_loader:
@@ -98,8 +94,6 @@ def get_variant_hashes_by_priority(
 def validate_variant(
     variant_desc: VariantDescription,
     variant_info: VariantInfo,
-    use_auto_install: bool = True,
-    isolated: bool = True,
     venv_path: str | pathlib.Path | None = None,
 ) -> VariantValidationResult:
     """
@@ -116,8 +110,6 @@ def validate_variant(
 
     with PluginLoader(
         variant_info=variant_info,
-        use_auto_install=use_auto_install,
-        isolated=isolated,
         venv_path=venv_path,
         enable_optional_plugins=True,
         filter_plugins=list({vprop.namespace for vprop in variant_desc.properties}),
@@ -158,8 +150,6 @@ def check_variant_supported(
     *,
     vdesc: VariantDescription | None = None,
     variant_info: VariantInfo,
-    use_auto_install: bool = True,
-    isolated: bool = True,
     venv_path: str | pathlib.Path | None = None,
     enable_optional_plugins: bool | list[VariantNamespace] = False,
 ) -> bool:
@@ -184,8 +174,6 @@ def check_variant_supported(
 
     with PluginLoader(
         variant_info=variant_info,
-        use_auto_install=use_auto_install,
-        isolated=isolated,
         venv_path=venv_path,
         enable_optional_plugins=enable_optional_plugins,
     ) as plugin_loader:

variantlib/commands/make_variant.py

@@ -188,7 +188,6 @@ def _make_variant(
                 vdesc_valid = validate_variant(
                     vdesc,
                     variant_info=variant_info,
-                    use_auto_install=False,
                     venv_path=venv.path if venv is not None else None,
                 )
                 if vdesc_valid.invalid_properties:

variantlib/plugins/loader.py

@@ -18,7 +18,6 @@
 
 from packaging.markers import Marker
 from packaging.markers import default_environment
-from packaging.requirements import Requirement
 from variantlib.constants import VALIDATION_PROVIDER_PLUGIN_API_REGEX
 from variantlib.errors import NoPluginFoundError
 from variantlib.errors import PluginError
@@ -62,16 +61,9 @@ class BasePluginLoader:
 
     def __init__(
         self,
-        use_auto_install: bool,
-        isolated: bool = True,
         venv_path: Path | None = None,
     ) -> None:
-        self._use_auto_install = use_auto_install
-        # isolated=True is effective only with use_auto_install=True
-        # (otherwise we'd be using empty venv)
-        self._python_ctx_factory = partial(
-            python_env, isolated=isolated and use_auto_install, venv_path=venv_path
-        )
+        self._python_ctx_factory = partial(python_env, venv_path=venv_path)
 
     def __enter__(self) -> Self:
         if self._python_ctx is not None:
@@ -80,8 +72,6 @@ def __enter__(self) -> Self:
         self._python_ctx_manager = self._python_ctx_factory()
         self._python_ctx = self._python_ctx_manager.__enter__()
         try:
-            if self._use_auto_install:
-                self._install_all_plugins()
             self._load_all_plugins()
         except Exception:
             self._python_ctx_manager.__exit__(*sys.exc_info())
@@ -105,16 +95,6 @@ def __exit__(
         self._python_ctx = None
         self._python_ctx_manager.__exit__(exc_type, exc_value, traceback)
 
-    def _install_all_plugins(self) -> None:
-        pass
-
-    def _install_all_plugins_from_reqs(self, reqs: list[str]) -> None:
-        if self._python_ctx is None:
-            raise RuntimeError("Context manager not entered!")
-
-        # Actual plugin installation
-        self._python_ctx.install(reqs)
-
     def _call_subprocess(
         self, plugin_apis: list[str], commands: dict[str, Any]
     ) -> dict[str, dict[str, Any]]:
@@ -305,8 +285,6 @@ class PluginLoader(BasePluginLoader):
     def __init__(
         self,
         variant_info: VariantInfo,
-        use_auto_install: bool,
-        isolated: bool = True,
         venv_path: Path | None = None,
         enable_optional_plugins: bool | list[VariantNamespace] = False,
         filter_plugins: list[VariantNamespace] | None = None,
@@ -315,9 +293,7 @@ def __init__(
         self._enable_optional_plugins = enable_optional_plugins
         self._filter_plugins = filter_plugins
         self._environment = cast("dict[str, str]", default_environment())
-        super().__init__(
-            use_auto_install=use_auto_install, isolated=isolated, venv_path=venv_path
-        )
+        super().__init__(venv_path=venv_path)
 
     def _optional_provider_enabled(self, namespace: str) -> bool:
         # if enable_optional_plugins is a bool, it controls all plugins
@@ -352,44 +328,6 @@ def _provider_enabled(self, namespace: str, provider_data: ProviderInfo) -> bool
 
         return True
 
-    def _install_all_plugins(self) -> None:
-        # Installing the plugins
-        reqs = []
-        for namespace, provider_data in self._variant_info.providers.items():
-            if not self._provider_enabled(namespace, provider_data):
-                continue
-
-            if not (list_req_str := provider_data.requires):
-                logger.error(
-                    "Impossible to install the variant provider plugin corresponding "
-                    "to namespace `%(ns)s`. Missing provider requirement, "
-                    "received: %(data)s.",
-                    {"ns": namespace, "data": provider_data},
-                )
-                continue
-
-            for req_str in list_req_str:
-                pyreq = Requirement(req_str)
-                if not (
-                    pyreq.marker.evaluate(self._environment) if pyreq.marker else True
-                ):
-                    continue
-
-                # If there's at least one requirement compatible - break
-                break
-            else:
-                logger.debug(
-                    "The variant provider plugin corresponding "
-                    "to namespace `%(ns)s` has been skipped - Not compatible with the "
-                    "environmment. Details: %(data)s.",
-                    {"ns": namespace, "data": provider_data},
-                )
-                continue
-
-            reqs.extend(list_req_str)
-
-        self._install_all_plugins_from_reqs(reqs)
-
     def _load_all_plugins(self) -> None:
         if self._namespace_map is not None:
             raise RuntimeError(
@@ -412,7 +350,7 @@ def __init__(
         self,
         venv_path: Path | None = None,
     ) -> None:
-        super().__init__(use_auto_install=False, isolated=False, venv_path=venv_path)
+        super().__init__(venv_path=venv_path)
 
     def _load_all_plugins(self) -> None:
         if self._namespace_map is not None:
@@ -461,7 +399,7 @@ def __init__(
         venv_path: Path | None = None,
     ) -> None:
         self._plugin_apis = list(plugin_apis)
-        super().__init__(use_auto_install=False, isolated=False, venv_path=venv_path)
+        super().__init__(venv_path=venv_path)
 
     def _load_all_plugins(self) -> None:
         if self._namespace_map is not None:

variantlib/plugins/py_envs.py

@@ -135,7 +135,7 @@ def python_executable(self) -> pathlib.Path:
 
 @contextmanager
 def python_env(
-    isolated: bool = True, venv_path: pathlib.Path | None = None
+    isolated: bool = False, venv_path: pathlib.Path | None = None
 ) -> Generator[PythonEnv]:
     if venv_path is None and isolated:
         import venv