Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
ksunden merged 1 commit intomatplotlib:mainfromoscargus:kiwiversion
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

@oscargusoscargus added this to thev3.8.1 milestoneSep 17, 2023
@oscargusoscargus added the PR: dependenciesPull requests that update a dependency file labelSep 17, 2023
@ksundenksunden merged commitca52d68 intomatplotlib:mainSep 18, 2023
@lumberbot-app
Copy link

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.xgit 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 theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

ksunden added a commit to ksunden/matplotlib that referenced this pull requestSep 18, 2023
…o be consistent with requirementsMerge pull requestmatplotlib#26799 from oscargus/kiwiversionUpdate kiwisolver and pillow versions to be consistent with requirements(cherry picked from commitca52d68)Conflict was because numpy is pinned to `<2` on the release branch but not on main
timhoffm added a commit that referenced this pull requestSep 19, 2023
…-v3.8.xBackport PR#26799 on branch v3.8.x (Update kiwisolver and pillow versions to be consistent with requirements)
@ksundenksunden mentioned this pull requestNov 2, 2023
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@QuLogicQuLogicQuLogic approved these changes

@ksundenksundenksunden approved these changes

Assignees
No one assigned
Labels
PR: dependenciesPull requests that update a dependency file
Projects
None yet
Milestone
v3.8.1
Development

Successfully merging this pull request may close these issues.

3 participants
@oscargus@QuLogic@ksunden
[8]ページ先頭
©2009-2025 Movatter.jp