Skip to content

TST: temporarily pin pytest<8.1 - #16147

Merged
mhvk merged 1 commit into
astropy:mainfrom
neutrinoceros:tests/pin_pytest
Mar 4, 2024
Merged

mhvk merged 1 commit into
astropy:mainfrom
neutrinoceros:tests/pin_pytest

Conversation

@neutrinoceros

Copy link
Copy Markdown
Contributor

Description

A temporary workaround #16146

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

@github-actions

github-actions Bot commented Mar 4, 2024

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.

@github-actions

github-actions Bot commented Mar 4, 2024

Copy link
Copy Markdown
Contributor

👋 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?

@mhvk mhvk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Definitely, to get CI working again...

@mhvk

mhvk commented Mar 4, 2024

Copy link
Copy Markdown
Contributor

Seems wise to backport as well...

@mhvk
mhvk merged commit 1b5a144 into astropy:main Mar 4, 2024
@neutrinoceros
neutrinoceros deleted the tests/pin_pytest branch March 4, 2024 12:59
@lumberbot-app

lumberbot-app Bot commented Mar 4, 2024

Copy link
Copy Markdown

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout v6.0.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 1b5a144e968676d399e0033ace5672827180543c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #16147: TST: temporarily pin pytest<8.1'
  1. Push to a named branch:
git push YOURFORK v6.0.x:auto-backport-of-pr-16147-on-v6.0.x
  1. Create a PR against branch v6.0.x, I would have named this PR:

"Backport PR #16147 on branch v6.0.x (TST: temporarily pin pytest<8.1)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@neutrinoceros

Copy link
Copy Markdown
Contributor Author

Will do the manual backport

neutrinoceros pushed a commit to neutrinoceros/astropy that referenced this pull request Mar 4, 2024
@neutrinoceros

Copy link
Copy Markdown
Contributor Author

done in #16151

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.

3 participants