fixup! feat(config): Allow ranges in envlist

Author: mimre25

src/tox/config/loader/ini/factor.py

@@ -92,10 +92,22 @@ def name_with_negate(factor: str) -> tuple[str, bool]:
 def is_negated(factor: str) -> bool:
     return factor.startswith("!")
 
+def expand_ranges(value: str) -> str:
+    """Expand ranges in env expressions, eg py3{10-13} -> "py3{10,11,12,13}"""
+    matches = re.findall(r"((\d+)-(\d+)|\d+)(?:,|})", value)
+    for src, start_, end_ in matches:
+        if src and start_ and end_:
+            start = int(start_)
+            end = int(end_)
+            direction = 1 if start < end else -1
+            expansion = ",".join(str(x) for x in range(start, end + direction, direction))
+            value = value.replace(src, expansion, 1)
+    return value
 
 __all__ = (
     "expand_factors",
     "extend_factors",
     "filter_for_env",
     "find_envs",
+    "expand_ranges",
 )

src/tox/config/loader/replacer.py

@@ -287,24 +287,9 @@ def replace_env(conf: Config | None, args: list[str], conf_args: ConfigLoadArgs)
 def replace_tty(args: list[str]) -> str:
     return (args[0] if len(args) > 0 else "") if sys.stdout.isatty() else args[1] if len(args) > 1 else ""
 
-
-def expand_ranges(value: str) -> str:
-    """Expand ranges in env expressions, eg py3{10-13} -> "py3{10,11,12,13}"""
-    matches = re.findall(r"((\d+)-(\d+)|\d+)(?:,|})", value)
-    for src, start_, end_ in matches:
-        if src and start_ and end_:
-            start = int(start_)
-            end = int(end_)
-            direction = 1 if start < end else -1
-            expansion = ",".join(str(x) for x in range(start, end + direction, direction))
-            value = value.replace(src, expansion, 1)
-    return value
-
-
 __all__ = [
     "MatchExpression",
     "MatchRecursionError",
-    "expand_ranges",
     "find_replace_expr",
     "load_posargs",
     "replace",

src/tox/config/loader/str_convert.py

@@ -10,7 +10,7 @@
 from typing import TYPE_CHECKING, Any, Iterator
 
 from tox.config.loader.convert import Convert
-from tox.config.loader.replacer import expand_ranges
+from tox.config.loader.ini.factor import expand_ranges
 from tox.config.types import Command, EnvList
 
 if TYPE_CHECKING:

src/tox/config/source/ini_section.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from tox.config.loader.ini.factor import extend_factors
-from tox.config.loader.replacer import expand_ranges
+from tox.config.loader.ini.factor import extend_factors, expand_ranges
 from tox.config.loader.section import Section