From 7c396bdd207470de0053ca80b6a937ec4b5dd586 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 20:47:27 +0000 Subject: [PATCH 1/6] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/astral-sh/ruff-pre-commit: v0.12.12 → v0.13.0](https://github.com/astral-sh/ruff-pre-commit/compare/v0.12.12...v0.13.0) - [github.com/pre-commit/mirrors-mypy: v1.17.1 → v1.18.1](https://github.com/pre-commit/mirrors-mypy/compare/v1.17.1...v1.18.1) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 644ebfd6..4a16f682 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: "v0.12.12" + rev: "v0.13.0" hooks: - id: ruff args: ["--fix"] @@ -23,7 +23,7 @@ repos: language: python additional_dependencies: [pygments, restructuredtext_lint] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.17.1 + rev: v1.18.1 hooks: - id: mypy files: ^(src/|testing/) From a33d96be46d9d6c563f5e30a3e42bdaea03dd73d Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 16 Sep 2025 09:25:17 -0300 Subject: [PATCH 2/6] Rename variable 'status' to '_status' for clarity --- src/xdist/dsession.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xdist/dsession.py b/src/xdist/dsession.py index 5bf7d980..47e1de7d 100644 --- a/src/xdist/dsession.py +++ b/src/xdist/dsession.py @@ -582,7 +582,7 @@ def get_workers_status_line( # All workers collect the same number of items, so we grab # the total number of items from the first worker. first = status_and_items[0] - status, tests_collected = first + _status, tests_collected = first tests_noun = "item" if tests_collected == 1 else "items" return f"{total_workers} {workers_noun} [{tests_collected} {tests_noun}]" if WorkerStatus.CollectionDone in statuses: From 8c5b33fbadbac31926cddaeed373058e4d54a413 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 16 Sep 2025 09:25:34 -0300 Subject: [PATCH 3/6] Update loop_once to ignore reports in result --- src/xdist/looponfail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xdist/looponfail.py b/src/xdist/looponfail.py index 38f1e6f1..7fcebe51 100644 --- a/src/xdist/looponfail.py +++ b/src/xdist/looponfail.py @@ -132,7 +132,7 @@ def loop_once(self) -> None: self.setup() self.wasfailing = self.failures and len(self.failures) result = self.runsession() - failures, reports, collection_failed = result + failures, _reports, collection_failed = result if collection_failed: pass # "Collection failed, keeping previous failure set" else: From 91e3a18e23b8f227de9c67fa7d2b313fcf85cdc2 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 16 Sep 2025 09:26:02 -0300 Subject: [PATCH 4/6] Fix variable name in loadscope.py --- src/xdist/scheduler/loadscope.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xdist/scheduler/loadscope.py b/src/xdist/scheduler/loadscope.py index 0a01cb49..73162dcd 100644 --- a/src/xdist/scheduler/loadscope.py +++ b/src/xdist/scheduler/loadscope.py @@ -388,7 +388,7 @@ def schedule(self) -> None: self.log(f"Shutting down {extra_nodes} nodes") for _ in range(extra_nodes): - unused_node, assigned = self.assigned_work.popitem() + unused_node, _assigned = self.assigned_work.popitem() self.log(f"Shutting down unused node {unused_node}") unused_node.shutdown() From bcfcc839cce200b9e6e94e34f9af9d3e1a98402b Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 16 Sep 2025 09:26:39 -0300 Subject: [PATCH 5/6] Rename variable 'topdir' to '_topdir' in tests --- testing/test_looponfail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/test_looponfail.py b/testing/test_looponfail.py index eda0ad12..844736f6 100644 --- a/testing/test_looponfail.py +++ b/testing/test_looponfail.py @@ -116,7 +116,7 @@ def test_nofailures(self, pytester: pytest.Pytester) -> None: item = pytester.getitem("def test_func(): pass\n") control = RemoteControl(item.config) control.setup() - topdir, failures = control.runsession()[:2] + _topdir, failures = control.runsession()[:2] assert not failures def test_failures_somewhere(self, pytester: pytest.Pytester) -> None: @@ -128,7 +128,7 @@ def test_failures_somewhere(self, pytester: pytest.Pytester) -> None: control.setup() item.path.write_text("def test_func():\n assert 1\n") removepyc(item.path) - topdir, failures = control.runsession()[:2] + _topdir, failures = control.runsession()[:2] assert not failures def test_failure_change(self, pytester: pytest.Pytester) -> None: @@ -218,7 +218,7 @@ def test_func(): ) control = RemoteControl(item.config) control.setup() - topdir, failures = control.runsession()[:2] + _topdir, failures = control.runsession()[:2] assert not failures From 435f5d8ad700b00d555961ca3b23fb2894497998 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 16 Sep 2025 09:27:06 -0300 Subject: [PATCH 6/6] Fix variable name in test for remote processing --- testing/test_remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/test_remote.py b/testing/test_remote.py index ba24295c..909f7ca2 100644 --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -235,7 +235,7 @@ def test_process_from_remote_error_handling( worker.use_callback = True worker.setup() worker.slp.process_from_remote(("", {})) - out, err = capsys.readouterr() + out, _err = capsys.readouterr() assert "INTERNALERROR> ValueError: unknown event: " in out ev = worker.popevent() assert ev.name == "errordown"