Merge pytest-xdist latest changes + correct lint errors in nTop fork #6

ciaconet · 2024-09-19T17:11:25Z

Summary

Merge latest changes to upstream and correct lint errors in fork.

Testing

python -m mypy src --ignore-missing-imports --strict

python -m ruff check

updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.1 → v0.6.2](astral-sh/ruff-pre-commit@v0.6.1...v0.6.2) - [github.com/pre-commit/mirrors-mypy: v1.11.1 → v1.11.2](pre-commit/mirrors-mypy@v1.11.1...v1.11.2) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Bumps the github-actions group with 1 update: [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `pypa/gh-action-pypi-publish` from 1.9.0 to 1.10.0 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](pypa/gh-action-pypi-publish@v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.2 → v0.6.3](astral-sh/ruff-pre-commit@v0.6.2...v0.6.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Follow up to pytest-dev#1123.

…#1127) Bumps the github-actions group with 2 updates: [hynek/build-and-inspect-python-package](https://github.com/hynek/build-and-inspect-python-package) and [pypa/gh-action-pypi-publish](https://github.com/pypa/gh-action-pypi-publish). Updates `hynek/build-and-inspect-python-package` from 2.8 to 2.9 - [Release notes](https://github.com/hynek/build-and-inspect-python-package/releases) - [Changelog](https://github.com/hynek/build-and-inspect-python-package/blob/main/CHANGELOG.md) - [Commits](hynek/build-and-inspect-python-package@v2.8...v2.9) Updates `pypa/gh-action-pypi-publish` from 1.10.0 to 1.10.1 - [Release notes](https://github.com/pypa/gh-action-pypi-publish/releases) - [Commits](pypa/gh-action-pypi-publish@v1.10.0...v1.10.1) --- updated-dependencies: - dependency-name: hynek/build-and-inspect-python-package dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: pypa/gh-action-pypi-publish dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.3 → v0.6.4](astral-sh/ruff-pre-commit@v0.6.3...v0.6.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.4 → v0.6.5](astral-sh/ruff-pre-commit@v0.6.4...v0.6.5) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

…619-lint-merge

Heroico

I don't like what the linter demands but don't want to fight the upstream either.

Heroico · 2024-09-19T21:54:20Z

src/xdist/dsession.py

@@ -287,7 +296,9 @@ def worker_workerfinished(self, node: WorkerController) -> None:
                try:
                    self.prepare_for_reschedule()
                except Exception as e:
-                    self.shouldstop = f"Exception caught during preparation for rescheduling. Giving up.\n{''.join(traceback.format_exception(e))}"
+                    msg = ("Exception caught during preparation for rescheduling. Giving up."


src/xdist/scheduler/load.py

Heroico

Thanks, this should help communications with the upstream.

Heroico · 2024-09-20T17:00:59Z

src/xdist/workermanage.py

@@ -83,7 +82,7 @@ def rsync_roots(self, gateway: execnet.Gateway) -> None:
    def setup_nodes(
        self,
        putevent: Callable[[tuple[str, dict[str, Any]]], None],
-        max_nodes: Optional[int] = None    
+        max_nodes: int | None = None


I wish we could use Optional 😢

mlopez-ntop · 2024-09-20T18:00:53Z

Locally I got the following. xdist is from the upstream right?

src\xdist\looponfail.py:169: error: Incompatible types in assignment (expression has type "ChannelFileWrite", variable has type "TextIO")  [assignment]
src\xdist\plugin.py:34: error: Returning Any from function declared to return "int"  [no-any-return]
src\xdist\plugin.py:36: error: Module "os" has no attribute "sched_getaffinity"  [attr-defined]
Found 3 errors in 2 files (checked 18 source files)```

ciaconet · 2024-09-20T18:17:32Z

Locally I got the following. xdist is from the upstream right?

src\xdist\looponfail.py:169: error: Incompatible types in assignment (expression has type "ChannelFileWrite", variable has type "TextIO")  [assignment]
src\xdist\plugin.py:34: error: Returning Any from function declared to return "int"  [no-any-return]
src\xdist\plugin.py:36: error: Module "os" has no attribute "sched_getaffinity"  [attr-defined]
Found 3 errors in 2 files (checked 18 source files)```

This is likely a mypy version difference, try with 1.11.2

mlopez-ntop · 2024-09-20T18:28:05Z

Locally I got the following. xdist is from the upstream right?

src\xdist\looponfail.py:169: error: Incompatible types in assignment (expression has type "ChannelFileWrite", variable has type "TextIO")  [assignment]
src\xdist\plugin.py:34: error: Returning Any from function declared to return "int"  [no-any-return]
src\xdist\plugin.py:36: error: Module "os" has no attribute "sched_getaffinity"  [attr-defined]
Found 3 errors in 2 files (checked 18 source files)```

This is likely a mypy version difference, try with 1.11.2

A bit closer with that version

src\xdist\plugin.py:34: error: Returning Any from function declared to return "int"  [no-any-return]
src\xdist\plugin.py:36: error: Module "os" has no attribute "sched_getaffinity"  [attr-defined]
Found 2 errors in 1 file (checked 18 source files)```

ciaconet · 2024-09-20T18:30:32Z

Locally I got the following. xdist is from the upstream right?

src\xdist\looponfail.py:169: error: Incompatible types in assignment (expression has type "ChannelFileWrite", variable has type "TextIO")  [assignment]
src\xdist\plugin.py:34: error: Returning Any from function declared to return "int"  [no-any-return]
src\xdist\plugin.py:36: error: Module "os" has no attribute "sched_getaffinity"  [attr-defined]
Found 3 errors in 2 files (checked 18 source files)```

This is likely a mypy version difference, try with 1.11.2

A bit closer with that version

src\xdist\plugin.py:34: error: Returning Any from function declared to return "int"  [no-any-return]
src\xdist\plugin.py:36: error: Module "os" has no attribute "sched_getaffinity"  [attr-defined]
Found 2 errors in 1 file (checked 18 source files)```

Those files weren't modified, I'd assume another package like os is at a different version, should be fine to ignore. Worst case we open another PR to our fork

pre-commit-ci bot and others added 10 commits August 26, 2024 23:28

[pre-commit.ci] pre-commit autoupdate (pytest-dev#1124)

59866c7

updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.2 → v0.6.3](astral-sh/ruff-pre-commit@v0.6.2...v0.6.3) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Publish package with attestations (pytest-dev#1125)

00231dc

Follow up to pytest-dev#1123.

[pre-commit.ci] pre-commit autoupdate (pytest-dev#1128)

b05a5bc

updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.3 → v0.6.4](astral-sh/ruff-pre-commit@v0.6.3...v0.6.4) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

[pre-commit.ci] pre-commit autoupdate (pytest-dev#1129)

a66354a

updates: - [github.com/astral-sh/ruff-pre-commit: v0.6.4 → v0.6.5](astral-sh/ruff-pre-commit@v0.6.4...v0.6.5) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Merge remote-tracking branch 'pytest-xdist/master' into dev/ci/TUR-21…

a1dfb69

…619-lint-merge

all ruff checks should pass

05b9494

mypy fixes

b809187

ciaconet requested review from mlopez-ntop and Heroico September 19, 2024 18:26

Heroico approved these changes Sep 19, 2024

View reviewed changes

undo protocol/other scheduler changes, add asserts for mypy check

0077510

ciaconet requested a review from Heroico September 20, 2024 15:00

ciaconet added 2 commits September 20, 2024 11:02

undo newline add/remove changes in diff for other schedulers

7ef7bd6

remove unused function from dsession.py

4e8cbff

Heroico approved these changes Sep 20, 2024

View reviewed changes

mlopez-ntop approved these changes Sep 20, 2024

View reviewed changes

ciaconet merged commit c82840f into main Sep 20, 2024
19 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge pytest-xdist latest changes + correct lint errors in nTop fork #6

Merge pytest-xdist latest changes + correct lint errors in nTop fork #6

ciaconet commented Sep 19, 2024 •

edited

Loading

Heroico left a comment

Heroico Sep 19, 2024

Heroico left a comment

Heroico Sep 20, 2024

mlopez-ntop commented Sep 20, 2024

ciaconet commented Sep 20, 2024

mlopez-ntop commented Sep 20, 2024

ciaconet commented Sep 20, 2024

Merge pytest-xdist latest changes + correct lint errors in nTop fork #6

Merge pytest-xdist latest changes + correct lint errors in nTop fork #6

Conversation

ciaconet commented Sep 19, 2024 • edited Loading

Summary

Testing

Heroico left a comment

Choose a reason for hiding this comment

Heroico Sep 19, 2024

Choose a reason for hiding this comment

Heroico left a comment

Choose a reason for hiding this comment

Heroico Sep 20, 2024

Choose a reason for hiding this comment

mlopez-ntop commented Sep 20, 2024

ciaconet commented Sep 20, 2024

mlopez-ntop commented Sep 20, 2024

ciaconet commented Sep 20, 2024

ciaconet commented Sep 19, 2024 •

edited

Loading