Skip to content

Backport #9417 to 6.2.x #9571

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

Merged
merged 1 commit into from
Jan 29, 2022
Merged

Backport #9417 to 6.2.x #9571

merged 1 commit into from
Jan 29, 2022

Conversation

mgorny
Copy link
Contributor

@mgorny mgorny commented Jan 28, 2022

Please backport the py3.10 fix to 6.2.x. It applies cleanly and fixes the test failures. It will take some time before everyone's ready for 7.0.0, so fixing 6.2.x seems to be the right thing to do.

@nicoddemus
Copy link
Member

Thanks @mgorny!

I'm OK with backporting this change, however seems like we need to backport #9512 and #9247 as well to have a green CI.

@mgorny
Copy link
Contributor Author

mgorny commented Jan 29, 2022

Ok, I'll open PRs for them too. I was mostly concerned about tests that failed for me locally.

@mgorny
Copy link
Contributor Author

mgorny commented Jan 29, 2022

…aaaand done.

@nicoddemus
Copy link
Member

Thanks! Merge those, and took the liberty of rebasing this one.

@nicoddemus nicoddemus enabled auto-merge January 29, 2022 11:01
@nicoddemus nicoddemus merged commit c30ffc5 into pytest-dev:6.2.x Jan 29, 2022
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.

2 participants