From a3c3b9716582370f39c1870b47d20bd25f07bcca Mon Sep 17 00:00:00 2001
From: Tushar Sadhwani <tushar.sadhwani000@gmail.com>
Date: Fri, 7 Mar 2025 01:53:33 +0530
Subject: [PATCH 1/4] fix: Respect `--parallel N` with `--parallel-no-spinner`

---
 src/tox/session/cmd/run/parallel.py |  2 +-
 tests/session/cmd/test_parallel.py  | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/tox/session/cmd/run/parallel.py b/src/tox/session/cmd/run/parallel.py
index 71f898e904..5b3d05f752 100644
--- a/src/tox/session/cmd/run/parallel.py
+++ b/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,
     )
diff --git a/tests/session/cmd/test_parallel.py b/tests/session/cmd/test_parallel.py
index 89c007fb6c..5f072a2ac8 100644
--- a/tests/session/cmd/test_parallel.py
+++ b/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,
     )

From 460d33d63213e405e7f8948f9e3b28b6e16632fa Mon Sep 17 00:00:00 2001
From: Tushar Sadhwani <tushar.sadhwani000@gmail.com>
Date: Fri, 7 Mar 2025 01:56:36 +0530
Subject: [PATCH 2/4] add changelog entry

---
 docs/changelog/3495.bugfix.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/changelog/3495.bugfix.rst

diff --git a/docs/changelog/3495.bugfix.rst b/docs/changelog/3495.bugfix.rst
new file mode 100644
index 0000000000..93096b258f
--- /dev/null
+++ b/docs/changelog/3495.bugfix.rst
@@ -0,0 +1 @@
+- `--parallel-no-spinner` now respects max CPU set by `--parallel N`
\ No newline at end of file

From a4eae2aab9ad5354f3e7652aeb3c33cf083a2e86 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 6 Mar 2025 20:26:51 +0000
Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 docs/changelog/3495.bugfix.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog/3495.bugfix.rst b/docs/changelog/3495.bugfix.rst
index 93096b258f..4f28efac42 100644
--- a/docs/changelog/3495.bugfix.rst
+++ b/docs/changelog/3495.bugfix.rst
@@ -1 +1 @@
-- `--parallel-no-spinner` now respects max CPU set by `--parallel N`
\ No newline at end of file
+- `--parallel-no-spinner` now respects max CPU set by `--parallel N`

From cde2a243fc9d946bd2dca67993a566baf4c13cce Mon Sep 17 00:00:00 2001
From: Tushar Sadhwani <tushar.sadhwani000@gmail.com>
Date: Fri, 7 Mar 2025 01:57:30 +0530
Subject: [PATCH 4/4] fix backticks

---
 docs/changelog/3495.bugfix.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog/3495.bugfix.rst b/docs/changelog/3495.bugfix.rst
index 4f28efac42..6e7aab0b1f 100644
--- a/docs/changelog/3495.bugfix.rst
+++ b/docs/changelog/3495.bugfix.rst
@@ -1 +1 @@
-- `--parallel-no-spinner` now respects max CPU set by `--parallel N`
+- ``--parallel-no-spinner`` now respects max CPU set by ``--parallel N``