Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
Backport PR #26799 on branch v3.8.x (Update kiwisolver and pillow versions to be consistent with requirements)#26816
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
timhoffm merged 1 commit intomatplotlib:v3.8.xfromksunden:manual-backport-of-pr-26799-on-v3.8.xSep 19, 2023
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
…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
(Accidentally made this against main out of habit, updated the base) |
tacaswell approved these changesSep 18, 2023
pre-commit and appveyor seem to have been caught by my trying to merge into main initially, and did not restart when I fixed that... closing and reopening because I was unable to see another way to restart at least pre-commit. |
timhoffm approved these changesSep 19, 2023
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
None yet
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR summary
Conflict was due to pinning of numpy for the release branch to
<2PR checklist