Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport annotations to 8.2 #12496

Conversation

RonnyPfannschmidt
Copy link
Member

backport of #12467

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided (automation) changelog entry is part of PR label Jun 20, 2024
@RonnyPfannschmidt RonnyPfannschmidt changed the base branch from main to 8.2.x June 20, 2024 10:07
@RonnyPfannschmidt RonnyPfannschmidt changed the title backport annotations 8.2 backport annotations to 8.2 Jun 20, 2024
@RonnyPfannschmidt RonnyPfannschmidt force-pushed the ronny/backport-annotations-8.2 branch from 80e4b18 to e60afd5 Compare June 20, 2024 13:44
Copy link
Member

@The-Compiler The-Compiler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed via:

wget https://patch-diff.githubusercontent.com/raw/pytest-dev/pytest/pull/12467.diff
wget https://patch-diff.githubusercontent.com/raw/pytest-dev/pytest/pull/12496.diff
vimdiff 12467.diff 12496.diff

in order to basically diff the diffs 😅

) -> None:
object.__setattr__(self, "args", tuple(args))
object.__setattr__(self, "plugins", plugins)
object.__setattr__(self, "dir", dir)

cache: Cache
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cache: Cache
# Set by cacheprovider plugin.
cache: Cache

for consistency with main (and less confusion).

Also, main has Cache | None here, but I think this is actually more correct? Looking at pytest_configure in cacheprovider.py I don't see a reason why this should ever be None...

self,
which_reports: str,
sep_title: str,
*,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems unrelated, was this intended?

@RonnyPfannschmidt RonnyPfannschmidt merged commit 76065e5 into pytest-dev:8.2.x Jun 21, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot:chronographer:provided (automation) changelog entry is part of PR
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants