Skip to content

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

Merged
nicoddemus merged 1 commit into
pytest-dev:7.0.xfrom
nicoddemus:backport-9359
Dec 7, 2021
Merged

[7.0.x] Fixed error message prints function decorators when using assert in Python 3.9 and above#9381
nicoddemus merged 1 commit into
pytest-dev:7.0.xfrom
nicoddemus:backport-9359

Conversation

@nicoddemus

Copy link
Copy Markdown
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

The-Compiler commented Dec 7, 2021

Copy link
Copy Markdown
Member

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
Copy Markdown
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.

3 participants