Skip to content

Conversation

@rcomer
Copy link
Member

@rcomer rcomer commented Nov 22, 2021

🚀 Pull Request

Description

Changes to get tests passing with Matplotlib v3.5.


Consult Iris pull request check list

@rcomer
Copy link
Member Author

rcomer commented Nov 22, 2021

See #4424 for failing tests.

@rcomer
Copy link
Member Author

rcomer commented Nov 27, 2021

The replaced commit on the auto-update-lockfiles branch gave me a bunch of conflicts in the lockfiles as I had the original commit (774f9cf) which no longer exists in the target branch. I fIxed this by dropping that commit with an interactive rebase before rebasing back onto upstream/auto-update-lockfiles.

Do we know if it's possible for the lockfile action to add a new commit to the branch rather than replace the existing commit? That would make this a little more straightforward I think. Probably a question for @jamesp.

@jamesp
Copy link
Member

jamesp commented Nov 29, 2021

I think that we included some logic in the GHA to stop the bot from clobbering any additional commits already on the auto-update-lockfiles branch, but not for the workflow you're describing @rcomer.

The workflow creates/updates the PR using this action: https://github.com/peter-evans/create-pull-request

It might be somewhere in the options but I can't recognise it from the descriptions given. We did also consider making a new PR for each run of the action - that would prevent this situation, but possibly result in a profusion of lockfile update PRs if we don't get to merging in each week.

@rcomer
Copy link
Member Author

rcomer commented Nov 29, 2021

Thanks for looking @jamesp. At least the new commit didn’t introduce new failures!

@trexfeathers trexfeathers self-assigned this Dec 1, 2021
@trexfeathers trexfeathers self-requested a review December 1, 2021 10:20
Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, especially the switch to mocking - big improvement. I have re-spun the failed tests to prove that the failed image test should be fine now.

@rcomer
Copy link
Member Author

rcomer commented Dec 1, 2021

Thanks @trexfeathers!

@trexfeathers trexfeathers merged commit 5b2df99 into SciTools:auto-update-lockfiles Dec 1, 2021
trexfeathers pushed a commit that referenced this pull request Dec 1, 2021
* Updated environment lockfiles

* Changes for Matplotlib v3.5 (#4428)

* add new image hash for gallery example

* update antialias tests

* whatsnew

Co-authored-by: Lockfile bot <[email protected]>
Co-authored-by: Ruth Comer <[email protected]>
@rcomer rcomer deleted the mpl-3.5 branch December 7, 2021 17:04
@rcomer rcomer mentioned this pull request Mar 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants