Merge TomlLoader and MemoryLoader

Author: ziima

src/tox/config/loader/memory.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Iterator
+from typing import TYPE_CHECKING, Any, Iterator, Sequence
 
 from tox.config.types import Command, EnvList
 
-from .api import Loader
+from .api import Loader, Override
 from .section import Section
 from .str_convert import StrConvert
 
@@ -14,9 +14,14 @@
 
 
 class MemoryLoader(Loader[Any]):
-    def __init__(self, **kwargs: Any) -> None:
-        super().__init__(Section(prefix="<memory>", name=str(id(self))), [])
-        self.raw: dict[str, Any] = {**kwargs}
+    def __init__(self, raw: dict[str, Any], *, section: Section | None = None, overrides: list[Override] | None = None,
+                 ) -> None:
+        section = section or Section(prefix="<memory>", name=str(id(self)))
+        super().__init__(section, overrides or [])
+        self.raw = raw
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}(section={self._section.key}, overrides={self.overrides!r})"
 
     def load_raw(self, key: Any, conf: Config | None, env_name: str | None) -> Any:  # noqa: ARG002
         return self.raw[key]
@@ -62,4 +67,6 @@ def to_env_list(value: Any) -> EnvList:
             return value
         if isinstance(value, str):
             return StrConvert.to_env_list(value)
+        if isinstance(value, Sequence):
+            return EnvList(value)
         raise TypeError(value)

src/tox/config/loader/toml.py

@@ -13,7 +13,7 @@
 
 from tox.config.loader.ini.factor import find_envs
 from tox.config.loader.section import Section
-from tox.config.loader.toml import TomlLoader
+from tox.config.loader.memory import MemoryLoader
 
 from .api import Source
 from .ini_section import CORE, PKG_ENV_PREFIX, TEST_ENV_PREFIX, IniSection
@@ -48,7 +48,7 @@ def __repr__(self) -> str:
     def transform_section(self, section: Section) -> Section:  # noqa: PLR6301
         return IniSection(section.prefix, section.name)
 
-    def get_loader(self, section: Section, override_map: OverrideMap) -> TomlLoader | None:
+    def get_loader(self, section: Section, override_map: OverrideMap) -> MemoryLoader | None:
         # look up requested section name in the generative testenv mapping to find the real config source
         for key in self._section_mapping.get(section.name) or []:
             if section.prefix is None or Section.from_key(key).prefix == section.prefix:
@@ -57,12 +57,10 @@ def get_loader(self, section: Section, override_map: OverrideMap) -> TomlLoader
             # if no matching section/prefix is found, use the requested section key as-is (for custom prefixes)
             key = section.key
         if key in self._raw:
-            return TomlLoader(
+            return MemoryLoader(
+                self._raw[key],
                 section=section,
-                raw=self._raw,
                 overrides=override_map.get(section.key, []),
-                core_section=self.CORE_SECTION,
-                section_key=key,
             )
         return None
 

src/tox/config/source/toml.py

@@ -91,12 +91,14 @@ def add_tox_requires_min_version(reqs: list[Requirement]) -> list[Requirement]:
 
     deps = ", ".join(f"{p}{'' if v is None else f' ({v})'}" for p, v in missing)
     loader = MemoryLoader(  # these configuration values are loaded from in-memory always (no file conf)
-        base=[],  # disable inheritance for provision environments
-        package="skip",  # no packaging for this please
-        # use our own dependency specification
-        deps=PythonDeps("\n".join(str(r) for r in requires), root=state.conf.core["tox_root"]),
-        pass_env=["*"],  # do not filter environment variables, will be handled by provisioned tox
-        recreate=state.conf.options.recreate and not state.conf.options.no_recreate_provision,
+        dict(
+            base=[],  # disable inheritance for provision environments
+            package="skip",  # no packaging for this please
+            # use our own dependency specification
+            deps=PythonDeps("\n".join(str(r) for r in requires), root=state.conf.core["tox_root"]),
+            pass_env=["*"],  # do not filter environment variables, will be handled by provisioned tox
+            recreate=state.conf.options.recreate and not state.conf.options.no_recreate_provision,
+        )
     )
     provision_tox_env: str = state.conf.core["provision_tox_env"]
     state.conf.memory_seed_loaders[provision_tox_env].append(loader)

src/tox/provision.py

@@ -35,8 +35,10 @@ def devenv(state: State) -> int:
     opt.skip_pkg_install = False  # always install a package in this case
     opt.no_test = True  # do not run the test phase
     loader = MemoryLoader(  # these configuration values are loaded from in-memory always (no file conf)
-        usedevelop=True,  # dev environments must be of type dev
-        env_dir=opt.devenv_path,  # move it in source
+        dict(
+            usedevelop=True,  # dev environments must be of type dev
+            env_dir=opt.devenv_path,  # move it in source
+        )
     )
     state.conf.memory_seed_loaders[next(iter(opt.env))].append(loader)
 

src/tox/session/cmd/devenv.py

@@ -34,9 +34,11 @@ def exec_(state: State) -> int:
         msg = f"exactly one target environment allowed in exec mode but found {', '.join(envs)}"
         raise HandledError(msg)
     loader = MemoryLoader(  # these configuration values are loaded from in-memory always (no file conf)
-        commands_pre=[],
-        commands=[],
-        commands_post=[],
+        dict(
+            commands_pre=[],
+            commands=[],
+            commands_post=[],
+        )
     )
     conf = state.envs[envs[0]].conf
     conf.loaders.insert(0, loader)

src/tox/session/cmd/exec_.py

@@ -129,7 +129,7 @@ def _handle_legacy_only_flags(option: Parsed, envs: EnvSelector) -> None:  # noq
         for env in envs.iter(only_active=True, package=False):
             env_conf = envs[env].conf
             if override:
-                env_conf.loaders.insert(0, MemoryLoader(**override))
+                env_conf.loaders.insert(0, MemoryLoader(override))
             if set_env:
                 cast(SetEnv, env_conf["set_env"]).update(set_env, override=True)
             if forced:

src/tox/session/cmd/legacy.py

@@ -8,16 +8,18 @@
 
 from tox.config.loader.api import ConfigLoadArgs, Override
 from tox.config.loader.memory import MemoryLoader
+from tox.config.loader.section import Section
 from tox.config.types import Command, EnvList
 
 
 def test_memory_loader_repr() -> None:
-    loader = MemoryLoader(a=1)
-    assert repr(loader) == "MemoryLoader"
+    core = Section(None, "tox")
+    loader = MemoryLoader({'a': 1}, section=core)
+    assert repr(loader) == "MemoryLoader(section=tox, overrides={})"
 
 
 def test_memory_loader_override() -> None:
-    loader = MemoryLoader(a=1)
+    loader = MemoryLoader({'a': 1})
     loader.overrides["a"] = [Override("a=2")]
     args = ConfigLoadArgs([], "name", None)
     loaded = loader.load("a", of_type=int, conf=None, factory=None, args=args)
@@ -48,11 +50,12 @@ def test_memory_loader_override() -> None:
         (os.getcwd(), Path, Path.cwd()),  # noqa: PTH109
         ("pip list", Command, Command(["pip", "list"])),
         ("a\nb", EnvList, EnvList(["a", "b"])),
+        (["a", "b"], EnvList, EnvList(["a", "b"])),
         ("1", Optional[int], 1),
     ],
 )
 def test_memory_loader(value: Any, of_type: type[Any], outcome: Any) -> None:
-    loader = MemoryLoader(a=value, kwargs={})
+    loader = MemoryLoader({'a': value, 'kwargs': {}})
     args = ConfigLoadArgs([], "name", None)
     loaded = loader.load("a", of_type=of_type, conf=None, factory=None, args=args)
     assert loaded == outcome
@@ -72,18 +75,18 @@ def test_memory_loader(value: Any, of_type: type[Any], outcome: Any) -> None:
     ],
 )
 def test_memory_loader_fails_invalid(value: Any, of_type: type[Any], exception: Exception, msg: str) -> None:
-    loader = MemoryLoader(a=value, kwargs={})
+    loader = MemoryLoader({'a': value, 'kwargs': {}})
     args = ConfigLoadArgs([], "name", None)
     with pytest.raises(exception, match=msg):  # type: ignore[call-overload]
         loader.load("a", of_type=of_type, conf=None, factory=None, args=args)
 
 
 def test_memory_found_keys() -> None:
-    loader = MemoryLoader(a=1, c=2)
+    loader = MemoryLoader({'a': 1, 'c': 2})
     assert loader.found_keys() == {"a", "c"}
 
 
 def test_memory_loader_contains() -> None:
-    loader = MemoryLoader(a=1)
+    loader = MemoryLoader({'a': 1})
     assert "a" in loader
     assert "b" not in loader

tests/config/loader/test_memory_loader.py

@@ -102,7 +102,7 @@ def test_config_overrides(tox_ini_conf: ToxIniCreator) -> None:
 
 def test_config_override_wins_memory_loader(tox_ini_conf: ToxIniCreator) -> None:
     main_conf = tox_ini_conf("[testenv]", override=[Override("testenv.c=ok")])
-    conf = main_conf.get_env("py", loaders=[MemoryLoader(c="something_else")])
+    conf = main_conf.get_env("py", loaders=[MemoryLoader({'c': "something_else"})])
     conf.add_config("c", of_type=str, default="d", desc="desc")
     assert conf["c"] == "ok"