-
-
Notifications
You must be signed in to change notification settings - Fork 21
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
v5.9.6 #75
v5.9.6 #75
Conversation
Hi! This is the friendly automated conda-forge-linting service. I just wanted to let you know that I linted all conda-recipes in your PR ( |
@conda-forge-admin, please rerender |
@jakirkham here |
Thanks Matt! 🙏 Could you please cherry-pick this commit ( 3e57a0c )? That should fix the macOS build failures |
@conda-forge-admin, please rerender |
…nda-forge-pinning 2024.02.02.14.47.44
@jakirkham now only failing on this pypy-win build |
Thanks Matt! 🙏 Glad to see that worked 😄 Looking upstream issue ( giampaolo/psutil#2325 ) appears relevant. If so, this upstream patch might be useful to add (note that is just upstream commit giampaolo/psutil@ccdb775 rendered as a patch) |
@jakirkham I might need a little more handholding here I apologize; I'm not sure what exactly to do here? Do I copy and paste the code you noted as a patch? And apply just to pypy 3.9 for windows? |
patches: | ||
- 0001-Add-missing-includes-for-macOS.patch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah would just download that patch into the recipe
directory, add it to this list, and commit those changes together
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okay I'll give it a shot
@conda-forge-admin, please rerender |
Hi! This is the friendly automated conda-forge-webservice. I tried to rerender for you, but it looks like there was nothing to do. This message was generated by GitHub actions workflow run https://github.com/conda-forge/psutil-feedstock/actions/runs/7822055889. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks Matt! 🙏
Added a small change below. Will add automerge so it merges after CI passes
@jakirkham I added the selector because it seems every cpython build is failing but they were passing previously |
@jakirkham wait... never mind something else is going on here |
Hi! This is the friendly conda-forge automerge bot! I considered the following status checks when analyzing this PR:
Thus the PR was passing and merged! Have a great day! |
Going to try restarting. The error looked a little weird. Something about being unable to get the source? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok think I understand what is happening
Am seeing the following in the CI log:
checking file HISTORY.rst
Hunk #1 FAILED at 10.
1 out of 1 hunk FAILED
Think this means the patch is conflicting when applied. Would suggest we just drop that part of the patch as we don't need it. Have indicated the lines below
That should fix the issue
Thanks Matt! 🙏 |
Thank YOU @jakirkham for all you help! |
Happy to help 🙂 |
Checklist
0
(if the version changed)conda-smithy
(Use the phrase@conda-forge-admin, please rerender
in a comment in this PR for automated rerendering)