Skip to content

Ensure exception notes are ignored for pytest < 8#16886

Merged
pllim merged 1 commit intoastropy:mainfrom
mhvk:exception-add-note-tests-only-with-pytest-8
Aug 26, 2024
Merged

Ensure exception notes are ignored for pytest < 8#16886
pllim merged 1 commit intoastropy:mainfrom
mhvk:exception-add-note-tests-only-with-pytest-8

Conversation

@mhvk
Copy link
Copy Markdown
Contributor

@mhvk mhvk commented Aug 26, 2024

As an alternative to #16885, which requires pytest >=8, this PR ensures exception notes are ignored for pytest < 8. This maybe is the easiest fix, since #16885 really should include removing any usage of PYTEST_LT_8_0.

Fixes #16884

  • By checking this box, the PR author has requested that maintainers do NOT use the "Squash and Merge" button. Maintainers should respect this when possible; however, the final decision is at the discretion of the maintainer that merges the PR.

@mhvk mhvk added this to the v7.0.0 milestone Aug 26, 2024
@mhvk mhvk requested a review from pllim August 26, 2024 19:56
@github-actions
Copy link
Copy Markdown
Contributor

Thank you for your contribution to Astropy! 🌌 This checklist is meant to remind the package maintainers who will review this pull request of some common things to look for.

  • Do the proposed changes actually accomplish desired goals?
  • Do the proposed changes follow the Astropy coding guidelines?
  • Are tests added/updated as required? If so, do they follow the Astropy testing guidelines?
  • Are docs added/updated as required? If so, do they follow the Astropy documentation guidelines?
  • Is rebase and/or squash necessary? If so, please provide the author with appropriate instructions. Also see instructions for rebase and squash.
  • Did the CI pass? If no, are the failures related? If you need to run daily and weekly cron jobs as part of the PR, please apply the "Extra CI" label. Codestyle issues can be fixed by the bot.
  • Is a change log needed? If yes, did the change log check pass? If no, add the "no-changelog-entry-needed" label. If this is a manual backport, use the "skip-changelog-checks" label unless special changelog handling is necessary.
  • Is this a big PR that makes a "What's new?" entry worthwhile and if so, is (1) a "what's new" entry included in this PR and (2) the "whatsnew-needed" label applied?
  • At the time of adding the milestone, if the milestone set requires a backport to release branch(es), apply the appropriate "backport-X.Y.x" label(s) before merge.

if not (PYTEST_LT_8_0 and sys.version_info >= (3, 11)):
# For python>=3.11, we use Exception.add_note, which
# pytest < 8 does not know how to deal with.
msg += ".*\n.*treated as dimensionless"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

My regex-fu isn't that strong but I thought usually having a \ in the match needs raw string?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Here, I do want the \n be interpreted as new-line. Happy it worked!

Copy link
Copy Markdown
Member

@pllim pllim left a comment

Choose a reason for hiding this comment

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

Since CI now green (failures unrelated), I guess maybe we don't need raw string after all. 🤷‍♀️ Let's merge then. Thanks for the quick fix!

@pllim pllim merged commit c9e928e into astropy:main Aug 26, 2024
@mhvk mhvk deleted the exception-add-note-tests-only-with-pytest-8 branch August 27, 2024 00:26
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.

TST: "Exotic archs" has 3 failures with AssertionError: Regex pattern did not match.

2 participants