Skip to content

Commit 32ec2b0

Browse files
committed
env_select: _mark_provision: remove loader argument
Now that the loader is seeded via state.conf.memory_seed_loaders, the provision loader no longer needs to be passed through this interface.
1 parent 78a4970 commit 32ec2b0

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

src/tox/provision.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def add_tox_requires_min_version(reqs: list[Requirement]) -> list[Requirement]:
9898
)
9999
provision_tox_env: str = state.conf.core["provision_tox_env"]
100100
state.conf.memory_seed_loaders[provision_tox_env].append(loader)
101-
state.envs._mark_provision(bool(missing), provision_tox_env, loader)
101+
state.envs._mark_provision(bool(missing), provision_tox_env)
102102

103103
from tox.plugin.manager import MANAGER
104104

src/tox/session/env_select.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from tox.tox_env.register import REGISTER
1414
from tox.tox_env.runner import RunToxEnv
1515

16-
from ..config.loader.memory import MemoryLoader
1716
from ..config.types import EnvList
1817
from ..report import HandledError
1918
from ..tox_env.errors import Skip
@@ -134,7 +133,7 @@ def __init__(self, state: State) -> None:
134133
self._manager = MANAGER
135134
self._log_handler = self._state._options.log_handler
136135
self._journal = self._state._journal
137-
self._provision: None | tuple[bool, str, MemoryLoader] = None
136+
self._provision: None | tuple[bool, str] = None
138137

139138
self._state.conf.core.add_config("labels", Dict[str, EnvList], {}, "core labels")
140139
tox_env_filter_regex = getattr(state.conf.options, "skip_env", "").strip()
@@ -248,8 +247,6 @@ def _build_run_env(self, name: str) -> RunToxEnv | None:
248247
# ignore other envs when this is a provision run
249248
return None
250249
env_conf = self._state.conf.get_env(name, package=False)
251-
if self._provision is not None and self._provision[1] == name:
252-
env_conf.loaders.insert(0, self._provision[2])
253250
desc = "the tox execute used to evaluate this environment"
254251
env_conf.add_config(keys="runner", desc=desc, of_type=str, default=self._state.conf.options.default_runner)
255252
runner = REGISTER.runner(cast(str, env_conf["runner"]))
@@ -371,8 +368,8 @@ def ensure_only_run_env_is_active(self) -> None:
371368
if invalid:
372369
raise HandledError(f"cannot run packaging environment(s) {','.join(invalid)}")
373370

374-
def _mark_provision(self, on: bool, provision_tox_env: str, loader: MemoryLoader) -> None:
375-
self._provision = on, provision_tox_env, loader
371+
def _mark_provision(self, on: bool, provision_tox_env: str) -> None:
372+
self._provision = on, provision_tox_env
376373

377374

378375
__all__ = [

0 commit comments

Comments
 (0)