Merge branch 'main' into fix/toml_setenv_from_file

Author: gaborbernat

.pre-commit-config.yaml

@@ -15,15 +15,15 @@ repos:
       - id: codespell
         additional_dependencies: ["tomli>=2.2.1"]
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.5.0"
+    rev: "v2.5.1"
     hooks:
       - id: pyproject-fmt
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: "v0.23"
     hooks:
       - id: validate-pyproject
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.9.7"
+    rev: "v0.9.9"
     hooks:
       - id: ruff-format
       - id: ruff
@@ -38,7 +38,7 @@ repos:
     hooks:
       - id: rst-backticks
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: "v3.5.2"
+    rev: "v3.5.3"
     hooks:
       - id: prettier
   - repo: local

docs/changelog/3495.bugfix.rst

@@ -0,0 +1 @@
+- ``--parallel-no-spinner`` now respects max CPU set by ``--parallel N``

src/tox/session/cmd/run/parallel.py

@@ -91,7 +91,7 @@ def run_parallel(state: State) -> int:
     option = state.conf.options
     return execute(
         state,
-        max_workers=None if option.parallel_no_spinner is True else option.parallel,
+        max_workers=auto_detect_cpus() if option.parallel == 0 else option.parallel,
         has_spinner=option.parallel_no_spinner is False and option.parallel_live is False,
         live=option.parallel_live,
     )

tests/session/cmd/test_parallel.py

@@ -14,6 +14,7 @@
 from tox.session.cmd.run.parallel import parse_num_processes
 from tox.tox_env.api import ToxEnv
 from tox.tox_env.errors import Fail
+from tox.util.cpu import auto_detect_cpus
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -180,7 +181,20 @@ def test_parallel_no_spinner(tox_project: ToxProjectCreator) -> None:
 
     mocked.assert_called_once_with(
         mock.ANY,
-        max_workers=None,
+        max_workers=auto_detect_cpus(),
+        has_spinner=False,
+        live=False,
+    )
+
+
+def test_parallel_no_spinner_with_parallel(tox_project: ToxProjectCreator) -> None:
+    """Ensure `--parallel N` is still respected with `--parallel-no-spinner`."""
+    with mock.patch.object(parallel, "execute") as mocked:
+        tox_project({"tox.ini": ""}).run("p", "--parallel-no-spinner", "--parallel", "2")
+
+    mocked.assert_called_once_with(
+        mock.ANY,
+        max_workers=2,
         has_spinner=False,
         live=False,
     )
@@ -197,7 +211,7 @@ def test_parallel_no_spinner_ci(
 
     mocked.assert_called_once_with(
         mock.ANY,
-        max_workers=None,
+        max_workers=auto_detect_cpus(),
         has_spinner=False,
         live=False,
     )
@@ -209,7 +223,7 @@ def test_parallel_no_spinner_legacy(tox_project: ToxProjectCreator) -> None:
 
     mocked.assert_called_once_with(
         mock.ANY,
-        max_workers=None,
+        max_workers=auto_detect_cpus(),
         has_spinner=False,
         live=False,
     )