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

[7.0.x] Fixed error message prints function decorators when using assert in Python 3.9 and above #9381

Merged
merged 1 commit into from
Dec 7, 2021

Conversation

nicoddemus
Copy link
Member

Backport of #9359

@nicoddemus nicoddemus merged commit df2c59c into pytest-dev:7.0.x Dec 7, 2021
@nicoddemus nicoddemus deleted the backport-9359 branch December 7, 2021 10:20
@The-Compiler
Copy link
Member

The-Compiler commented Dec 7, 2021

Would be good to at least wait for the CI before merging, just in case 😉. FWIW it looks like that wasn't enforced for the 7.0.x branch (hence the button doing an immediate merge instead of enabling auto-merging).

I just adjusted the branch protection rules so that the rules for 4.6.x now apply to *.x instead.

edit: Well, that ended up trying to wait for Travis CI... ended up creating a new one instead.

@nicoddemus
Copy link
Member Author

You are right; I merged when there was only 1 job left to complete, but doesn't hurt to play safe and wait them all.

I just adjusted the branch protection rules so that the rules for 4.6.x now apply to *.x instead.

Thanks!

@The-Compiler The-Compiler added this to the 7.0 milestone Dec 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants