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

Appearance settings

Fix failing animation test with pytest 6.2. #19108

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
Dec 14, 2020

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Dec 13, 2020

... per https://docs.pytest.org/en/stable/usage.html#unraisable.

PR Summary

PR Checklist

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • New features are documented, with examples if plot related.
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
  • New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

@timhoffm timhoffm added this to the v3.3.4 milestone Dec 14, 2020
@timhoffm timhoffm merged commit 5ab99ee into matplotlib:master Dec 14, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Dec 14, 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.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 5ab99eee3d605b782ea51262e461fb3e837b3039
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #19108: Fix failing animation test with pytest 6.2.'
  1. Push to a named branch :
git push YOURFORK v3.3.x:auto-backport-of-pr-19108-on-v3.3.x
  1. Create a PR against branch v3.3.x, I would have named this PR:

"Backport PR #19108 on branch v3.3.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.

@anntzer anntzer deleted the animtests branch December 14, 2020 02:27
timhoffm added a commit to timhoffm/matplotlib that referenced this pull request Dec 14, 2020
tacaswell added a commit that referenced this pull request Dec 22, 2020
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
Morty Proxy This is a proxified and sanitized view of the page, visit original site.