Skip to content

TST: Update org for pytest-doctestplus in devinfra#15820

Merged
pllim merged 1 commit intoastropy:mainfrom
pllim:pytest-dev-compat
Jan 10, 2024
Merged

TST: Update org for pytest-doctestplus in devinfra#15820
pllim merged 1 commit intoastropy:mainfrom
pllim:pytest-dev-compat

Conversation

@pllim
Copy link
Member

@pllim pllim commented Jan 6, 2024 •
edited
Loading

Description

This pull request is to test:

Fixes #15810

  • 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.

@pllim pllim added this to the v6.1.0 milestone Jan 6, 2024
@github-actions
Copy link
Contributor

github-actions bot commented Jan 6, 2024

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?
  • Is a milestone set? Milestone must be set but we cannot check for it on Actions; do not let the green checkmark fool you.
  • 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.

@github-actions
Copy link
Contributor

github-actions bot commented Jan 6, 2024

👋 Thank you for your draft pull request! Do you know that you can use [ci skip] or [skip ci] in your commit messages to skip running continuous integration tests until you are ready?

@pllim

This comment was marked as resolved.

Sign in to view
@pllim
Copy link
Member Author

pllim commented Jan 6, 2024

Okay, devinfra job is green here, so that means we need to patch not one, but three different plugins and get them released so our devinfra job can pass again. 🤪

@bsipocz and @astrofrog , are you able to help merge/release the affected plugins? 🙏

@pllim pllim added the Upstream Action Required Was: Upstream Fix Required label Jan 6, 2024
@bsipocz
Copy link
Member

bsipocz commented Jan 6, 2024

Has to wait till Monday, we got a lovely ❄️ storm 😀

@pllim
Copy link
Member Author

pllim commented Jan 6, 2024

No big rush, @bsipocz ! Since this is pytest-dev (not the RC), I think we have a while before it hits mainstream. 🤞

@pllim
Copy link
Member Author

pllim commented Jan 8, 2024

Actually maybe releases are unnecessary at this point, but those PRs would still need to be merged for packages testing against pytest-dev.

@bsipocz
Copy link
Member

bsipocz commented Jan 9, 2024

Merged what I could, but as you said, I'm not planning to do a release just yet but wait as more breaking changes or deprecations may come in the 8.1.x dev cycle.

@pllim
Copy link
Member Author

pllim commented Jan 9, 2024

Thanks, @bsipocz !

pllim
pllim commented Jan 9, 2024
View reviewed changes
tox.ini
devinfra: git+https://github.com/pytest-dev/pytest.git
devinfra: git+https://github.com/astropy/extension-helpers.git
devinfra: git+https://github.com/astropy/pytest-doctestplus.git
devinfra: git+https://github.com/scientific-python/pytest-doctestplus.git
Copy link
Member Author

@pllim pllim Jan 9, 2024

Choose a reason for hiding this comment

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

Note: This should go in no matter what. This is an oversight from when we moved pytest-doctestplus to Scientific Python.

bsipocz
bsipocz approved these changes Jan 9, 2024
View reviewed changes
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.

Giving the approval for changing the org to SP, so can merge this whenever the mpl patch gets merged.

@pllim pllim mentioned this pull request Jan 9, 2024
Merged
1 task
@pllim
TST: Update GitHub link for pytest-doctestplus
582d211 
because it was moved from astropy to scientific-python.

pytest 8.1 compatibility fixes were all merged upstream at
pytest-doctestplus, pytest-filter-subpackage, and pytest-mpl
@pllim pllim force-pushed the pytest-dev-compat branch from 99f0ee0 to 582d211 Compare January 10, 2024 21:20
@pllim pllim added backport-v6.0.x and removed Upstream Action Required Was: Upstream Fix Required Experimental labels Jan 10, 2024
@pllim pllim modified the milestones: v6.1.0, v6.0.1 Jan 10, 2024
@pllim pllim changed the title EXP: Test upstream fixes for pytest-filter-subpackage and pytest-doctestplus (devinfra) TST: Update org for pytest-doctestplus in devinfra Jan 10, 2024
@pllim pllim marked this pull request as ready for review January 10, 2024 21:37
@pllim
Copy link
Member Author

pllim commented Jan 10, 2024

Yay, devinfra job is green again! This PR now only updates the org for pytest-doctestplus.

@pllim pllim enabled auto-merge January 10, 2024 21:39
@pllim pllim merged commit 9c5ced8 into astropy:main Jan 10, 2024
meeseeksmachine pushed a commit to meeseeksmachine/astropy that referenced this pull request Jan 10, 2024
@pllim @meeseeksmachine
Backport PR astropy#15820: TST: Update org for pytest-doctestplus in …
95ab1ea 
…devinfra
@meeseeksmachine meeseeksmachine mentioned this pull request Jan 10, 2024
Merged
@pllim pllim deleted the pytest-dev-compat branch January 10, 2024 21:40
pllim added a commit that referenced this pull request Jan 10, 2024
@pllim
Merge pull request #15857 from meeseeksmachine/auto-backport-of-pr-15…
f4fb7fe 
…820-on-v6.0.x

Backport PR #15820 on branch v6.0.x (TST: Update org for pytest-doctestplus in devinfra)
nstarman pushed a commit to nstarman/astropy that referenced this pull request Jan 10, 2024
@pllim @nstarman
Merge pull request astropy#15820 from pllim/pytest-dev-compat
c82eb23 
TST: Update org for pytest-doctestplus in devinfra
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bsipocz bsipocz bsipocz approved these changes

Assignees

No one assigned

Labels

Extra CI Run cron CI as part of PR no-changelog-entry-needed testing

Projects

None yet

Milestone

v6.0.1

Development

Successfully merging this pull request may close these issues.

TST: PluginValidationError: Plugin 'pytest_filter_subpackage' for hook 'pytest_ignore_collect' with pytest-dev

2 participants

@pllim @bsipocz