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

v5.9.6 #75

Merged
merged 7 commits into from
Feb 8, 2024
Merged

v5.9.6 #75

merged 7 commits into from
Feb 8, 2024

Conversation

thewchan
Copy link

Checklist

  • Used a personal fork of the feedstock to propose changes
  • Bumped the build number (if the version is unchanged)
  • Reset the build number to 0 (if the version changed)
  • Re-rendered with the latest conda-smithy (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering)
  • Ensured the license file is being packaged.

@conda-forge-webservices
Copy link

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 (recipe) and found it was in an excellent condition.

@thewchan
Copy link
Author

@conda-forge-admin, please rerender

@thewchan
Copy link
Author

@jakirkham here

@jakirkham
Copy link
Member

Thanks Matt! 🙏

Could you please cherry-pick this commit ( 3e57a0c )? That should fix the macOS build failures

@thewchan
Copy link
Author

thewchan commented Feb 2, 2024

@conda-forge-admin, please rerender

@thewchan
Copy link
Author

thewchan commented Feb 2, 2024

@jakirkham now only failing on this pypy-win build

@jakirkham
Copy link
Member

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)

@thewchan
Copy link
Author

thewchan commented Feb 7, 2024

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

Comment on lines +11 to +12
patches:
- 0001-Add-missing-includes-for-macOS.patch
Copy link
Member

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

Copy link
Author

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

@thewchan
Copy link
Author

thewchan commented Feb 7, 2024

@conda-forge-admin, please rerender

Copy link
Contributor

github-actions bot commented Feb 7, 2024

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.

Copy link
Member

@jakirkham jakirkham left a 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

recipe/meta.yaml Outdated Show resolved Hide resolved
@jakirkham jakirkham added the automerge Merge the PR when CI passes label Feb 7, 2024
@thewchan
Copy link
Author

thewchan commented Feb 7, 2024

@jakirkham I added the selector because it seems every cpython build is failing but they were passing previously

@thewchan
Copy link
Author

thewchan commented Feb 7, 2024

@jakirkham wait... never mind something else is going on here

Copy link
Contributor

github-actions bot commented Feb 7, 2024

Hi! This is the friendly conda-forge automerge bot!

I considered the following status checks when analyzing this PR:

  • linter: passed
  • azure: passed

Thus the PR was passing and merged! Have a great day!

@jakirkham
Copy link
Member

Going to try restarting. The error looked a little weird. Something about being unable to get the source?

@jakirkham jakirkham removed the automerge Merge the PR when CI passes label Feb 8, 2024
Copy link
Member

@jakirkham jakirkham left a 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

recipe/0002-upstream-patch-for-pypy.patch Outdated Show resolved Hide resolved
@jakirkham jakirkham added the automerge Merge the PR when CI passes label Feb 8, 2024
@github-actions github-actions bot merged commit 6d57345 into conda-forge:v5.9.6 Feb 8, 2024
37 checks passed
@jakirkham
Copy link
Member

Thanks Matt! 🙏

@thewchan
Copy link
Author

thewchan commented Feb 8, 2024

Thank YOU @jakirkham for all you help!

@jakirkham
Copy link
Member

Happy to help 🙂

@mr-c mr-c mentioned this pull request Oct 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge the PR when CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants