Skip to content

Update kiwisolver and pillow versions to be consistent with requirements #26799

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

Merged
merged 1 commit into from
Sep 18, 2023

Conversation

oscargus
Copy link
Member

PR summary

It is documented that kiwisolver was bumped to 1.3.1 and pillow to 8 in MPL 3.8, but not consistently introduced in all files.

PR checklist

@oscargus oscargus added this to the v3.8.1 milestone Sep 17, 2023
@oscargus oscargus added the PR: dependencies Pull requests that update a dependency file label Sep 17, 2023
@ksunden ksunden merged commit ca52d68 into matplotlib:main Sep 18, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented Sep 18, 2023

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 v3.8.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 ca52d680f2db945c15bfe3f98b601177501a8974
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #26799: Update kiwisolver and pillow versions to be consistent with requirements'
  1. Push to a named branch:
git push YOURFORK v3.8.x:auto-backport-of-pr-26799-on-v3.8.x
  1. Create a PR against branch v3.8.x, I would have named this PR:

"Backport PR #26799 on branch v3.8.x (Update kiwisolver and pillow versions to be consistent with requirements)"

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.

ksunden added a commit to ksunden/matplotlib that referenced this pull request Sep 18, 2023
…o be consistent with requirements

Merge pull request matplotlib#26799 from oscargus/kiwiversion

Update kiwisolver and pillow versions to be consistent with requirements

(cherry picked from commit ca52d68)

Conflict was because numpy is pinned to `<2` on the release branch but not on main
timhoffm added a commit that referenced this pull request Sep 19, 2023
…-v3.8.x

Backport PR #26799 on branch v3.8.x (Update kiwisolver and pillow versions to be consistent with requirements)
@ksunden ksunden mentioned this pull request Nov 2, 2023
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants