Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix check_figures_equal for tests that use its fixtures. #16800

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Mar 17, 2020
Merged

Fix check_figures_equal for tests that use its fixtures. #16800

merged 1 commit into from
Mar 17, 2020

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Mar 17, 2020 •
edited by tacaswell
Loading

PR Summary

When #16770 was merged, it interacted poorly with the last change to check_figures_equal, due to the new arguments. This should work on tests both with and without any of those fixtures.

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • [N/A] New features are documented, with examples if plot related
  • [N/A] Documentation is sphinx and numpydoc compliant
  • [N/A] Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • [N/A] Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

[TAC edited to fix xref]

@QuLogic QuLogic added this to the v3.2.1 milestone Mar 17, 2020
tacaswell
tacaswell approved these changes Mar 17, 2020
View reviewed changes
Copy link
Member

@tacaswell tacaswell left a comment

Choose a reason for hiding this comment

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

anyone can merge to un-break CI

@tacaswell tacaswell mentioned this pull request Mar 17, 2020
Merged
2 tasks
@QuLogic QuLogic merged commit 7540cdd into matplotlib:master Mar 17, 2020
@QuLogic QuLogic deleted the checkfigeq branch March 17, 2020 08:31
@lumberbot-app
Copy link

lumberbot-app bot commented Mar 17, 2020

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.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 7540cdde6d33ec05859968c11f0af87fe1565932
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #16800: Fix check_figures_equal for tests that use its fixtures.'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-16800-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR #16800 on branch v3.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@QuLogic
Copy link
Member Author

QuLogic commented Mar 17, 2020

This is part of #16797 already.

weiji14 added a commit to GenericMappingTools/pygmt that referenced this pull request Sep 3, 2020
@weiji14
Ensure that pytest can be used with check_figures_equal
d3cab24 
Same logic that was implemented in
matplotlib/matplotlib#16800
weiji14 added a commit to GenericMappingTools/pygmt that referenced this pull request Sep 3, 2020
@weiji14
Ensure pytest fixtures can be used with check_figures_equal decorator
3e0d3fb 
Same logic that was implemented in
matplotlib/matplotlib#16800
@weiji14 weiji14 mentioned this pull request Sep 3, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tacaswell tacaswell tacaswell approved these changes

Assignees
No one assigned
Labels
topic: testing
Projects
None yet
Milestone
v3.2.1
Development

Successfully merging this pull request may close these issues.
2 participants
@QuLogic @tacaswell