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

MNT: Compat with pytest>=8 #236

Merged
merged 6 commits into from
Jan 9, 2024
Merged

Conversation

pllim
Copy link
Contributor

@pllim pllim commented Jan 6, 2024

Because the hook check has changed in 8.1 . See pytest-dev/pytest#11779 (comment)

because the hook check has changed in 8.1
Copy link
Member

@bsipocz bsipocz left a comment

Choose a reason for hiding this comment

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

I find having the conditional around the class makes things less readable, but if you say it's better this way, I'm OK with it.

That's being said, in the else branch there are some cleanups to be made for superfluous conditional.

pytest_doctestplus/plugin.py Outdated Show resolved Hide resolved
pytest_doctestplus/plugin.py Outdated Show resolved Hide resolved
@bsipocz
Copy link
Member

bsipocz commented Jan 8, 2024

Oh, and please mention it in the changelog.

@bsipocz bsipocz added this to the 1.2.0 milestone Jan 8, 2024
and add Dependabot for future auto-update
@pllim
Copy link
Contributor Author

pllim commented Jan 8, 2024

@bsipocz , I think I addressed your comments. Also did some infrastructure updates that I noticed while porting stuff from here to astropy/pytest-filter-subpackage#15 .

to within class
Copy link
Member

@bsipocz bsipocz left a comment

Choose a reason for hiding this comment

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

The code changes look, good, but I would like to play it save and include 8.0.x in the test suite. Given it's already the evening for you, I'll just push a commit to this branch, and go ahead and merge if CI is all green.

tox.ini Show resolved Hide resolved
@bsipocz bsipocz merged commit 15ab106 into scientific-python:main Jan 9, 2024
20 checks passed
@bsipocz
Copy link
Member

bsipocz commented Jan 9, 2024

Thanks @pllim!

@pllim pllim deleted the pytest-8.1 branch January 9, 2024 03:19
@pllim
Copy link
Contributor Author

pllim commented Jan 9, 2024

Indeed I was AFK so thanks for wrapping this up! 🙇‍♀️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants