Merge branch 'main' into users/rahuldevikar/fix3687-scoped

Author: rahuldevikar

docs/changelog/3433.bugfix.rst

@@ -0,0 +1,2 @@
+Normalize extra names when resolving dependencies so that underscores and hyphens are treated equivalently (e.g.
+``extras = snake_case`` now matches ``Provides-Extra: snake-case`` in wheel metadata) - by :user:`Fridayai700`.

docs/changelog/3445.bugfix.rst

@@ -0,0 +1,2 @@
+Fix ``setenv`` modifications to ``PATH`` being overwritten when tox environment paths are set up - by
+:user:`Fridayai700`

docs/changelog/3557.bugfix.rst

@@ -0,0 +1,2 @@
+Fix factor selection via ``TOX_FACTORS`` environment variable producing wrong results because ``append`` + ``nargs="+"``
+actions need nested list types for proper env var conversion - by :user:`Fridayai700`.

docs/changelog/3574.bugfix.rst

@@ -0,0 +1,2 @@
+Fix custom ``install_command`` being ignored when specified in TOML configuration (``tox.toml``/``pyproject.toml``) - by
+:user:`Fridayai700`.

docs/changelog/3590.bugfix.rst

@@ -0,0 +1 @@
+Fix env names containing dots (e.g. ``py3.11``) losing their description in TOML configuration - by :user:`Fridayai700`.

docs/changelog/3728.bugfix.rst

@@ -0,0 +1,2 @@
+Fix type checker CI failure by adding ``completion`` extras to ``type`` and ``type-min`` environments so ``ty`` can
+resolve the ``argcomplete`` import - by :user:`gaborbernat`.

src/tox/config/cli/parser.py

@@ -66,7 +66,10 @@ def get_type(action: Action) -> type[Any]:
         of_type: type[Any] | None = getattr(action, "of_type", None)
         if of_type is None:
             if isinstance(action, argparse._AppendAction):  # noqa: SLF001
-                of_type = list[action.type]  # ty: ignore[invalid-type-form] # runtime generic from argparse action type
+                if action.nargs in {"+", "*"} or (isinstance(action.nargs, int) and action.nargs > 1):
+                    of_type = list[list[action.type]]  # ty: ignore[invalid-type-form] # nargs produces list per invocation
+                else:
+                    of_type = list[action.type]  # ty: ignore[invalid-type-form] # runtime generic from argparse action type
             elif isinstance(action, argparse._StoreAction) and action.choices:  # noqa: SLF001
                 loc = locals()
                 loc["Literal"] = Literal

src/tox/config/loader/toml/_replace.py

@@ -123,6 +123,7 @@ def __call__(self, value: str, conf_args: ConfigLoadArgs) -> str | None:
                     default = settings["default"]
                     if default is not None:
                         return default
+                    return None  # keep original text, consistent with ini loader behavior
                 raise exception
         return value
 

src/tox/config/source/toml_pyproject.py

@@ -55,11 +55,16 @@ def run_env_base(cls) -> str:
 
     @property
     def keys(self) -> Iterable[str]:
-        key = self.key
-        keys = key.split(self.SEP) if self.key else []
-        if self.PREFIX and len(keys) >= len(self.PREFIX) and tuple(keys[: len(self.PREFIX)]) == self.PREFIX:
-            keys = keys[len(self.PREFIX) :]
-        return keys
+        # Build keys from prefix + name directly, preserving dots in names (e.g. env "py3.11").
+        prefix, name = self._prefix, self._name
+        if prefix is None and not name:
+            return []
+        parts: list[str] = prefix.split(self.SEP) if prefix else []
+        if self.PREFIX and len(parts) >= len(self.PREFIX) and tuple(parts[: len(self.PREFIX)]) == self.PREFIX:
+            parts = parts[len(self.PREFIX) :]  # strip global PREFIX (e.g. ("tool", "tox"))
+        if name:
+            parts.append(name)
+        return parts
 
 
 class TomlPyProjectSection(TomlSection):
@@ -113,17 +118,20 @@ def get_loader(self, section: Section, override_map: OverrideMap) -> Loader[Any]
 
     def envs(self, core_conf: CoreConfigSet) -> Iterator[str]:
         yield from core_conf["env_list"]
-        yield from [i.key for i in self.sections()]
+        yield from [section.name for section in self.sections()]
 
     def sections(self) -> Iterator[Section]:
         for env_name in self._our_content.get(self._Section.ENV, {}):
             if not isinstance(env_name, str):
                 msg = f"Environment key must be string, got {env_name!r}"
                 raise HandledError(msg)
-            yield self._Section.from_key(env_name)
+            yield self._Section.test_env(env_name)
 
     def get_base_sections(self, base: list[str], in_section: Section) -> Iterator[Section]:  # noqa: ARG002
-        yield from [self._Section.from_key(b) for b in base]
+        core_prefix = self._Section.core_prefix()
+        strip = f"{core_prefix}{self._Section.SEP}" if core_prefix else ""
+        for entry in base:
+            yield self._Section(prefix=core_prefix or None, name=entry.removeprefix(strip))
 
     def get_tox_env_section(self, item: str) -> tuple[Section, list[str], list[str]]:
         return self._Section.test_env(item), [self._Section.run_env_base()], [self._Section.package_env_base()]

src/tox/tox_env/api.py

@@ -386,6 +386,9 @@ def environment_variables(self) -> dict[str, str]:
         result["PATH"] = self._make_path()
         for key in set_env:
             result[key] = set_env.load(key)
+        # if set_env modified PATH, re-prepend virtual-env paths (deduped) so they always come first
+        if self._paths and "PATH" in set_env:
+            result["PATH"] = self._make_path(result["PATH"])
         result["TOX_ENV_NAME"] = self.name
         result["TOX_WORK_DIR"] = str(self.core["work_dir"])
         result["TOX_ENV_DIR"] = str(self.conf["env_dir"])
@@ -406,21 +409,18 @@ def _paths(self) -> list[Path]:
     @_paths.setter
     def _paths(self, value: list[Path]) -> None:
         self._paths_private = value
-        # also update the environment variable with the new value
-        if self._env_vars is not None:  # pragma: no branch
-            # remove duplicates and prepend the tox env paths
-            result = self._make_path()
-            self._env_vars["PATH"] = result
+        # Invalidate cached env vars so they rebuild on next access, preserving set_env PATH modifications.
+        self._env_vars = None
 
     @property
     def _allow_externals(self) -> list[str]:
         result: list[str] = [f"{i}{os.sep}*" for i in self._paths]
         result.extend(i.strip() for i in self.conf["allowlist_externals"])
         return result
 
-    def _make_path(self) -> str:
+    def _make_path(self, existing: str | None = None) -> str:
         values = dict.fromkeys(str(i) for i in self._paths)
-        values.update(dict.fromkeys(os.environ.get("PATH", "").split(os.pathsep)))
+        values.update(dict.fromkeys((existing or os.environ.get("PATH", "")).split(os.pathsep)))
         return os.pathsep.join(values)
 
     def execute(  # noqa: PLR0913