[Backport #6914] Revert "[parametrize] enforce explicit argnames declaration (#6330)"#6919
Conversation
Revert "[parametrize] enforce explicit argnames declaration (pytest-dev#6330)"
bluetech
left a comment
There was a problem hiding this comment.
I guess it's more of a "forward" port :)
I haven't checked extensively -- assuming it's just a revert and same as #6914, LGTM.
Either way, what should we do with the CHANGELOG on backports like this one?
I guess we need to decide with to do with the changelogs anyway. I'll open an issue about this (and other things about the release maybe) later.
Also this PR is not a good test-case, because it went in the wrong way (first to release branch and then to master).
For now, what I'd do is:
- Remove changelog from this PR & merge it.
- Once the patch release containing this is done, cherry-pick the release PR to master (which includes the doc updates & changelog).
Heh yep. 😅
Definitely, my bad, I realized my mistake too late.
5.4.1 has been released already, so aren't those two suggestions the same thing? Both would end with the change on |
My thinking is, that the changelog will be included in 5.4.2, and we will cherry-pick the 5.4.2 changelog to master (like 68d4b17), then if this PR changelog is also included in master, then it will eventually be duplicated in 5.5.0. But I may be missing something too :) |
I realize now that I should have done the other way around: revert the original PR on
master, and then backport to5.4.x.Either way, what should we do with the CHANGELOG on backports like this one?