Skip to content

Move mplot3d autoregistration api changes to 3.2. #16272

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
Jan 21, 2020

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Jan 20, 2020

This was wrongly put into the 3.1 notes.

Closes #16192.

Should perhaps also be backported to 3.1.

PR Summary

PR Checklist

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

This was wrongly put into the 3.1 notes.
@anntzer anntzer added Documentation Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. labels Jan 20, 2020
@anntzer anntzer added this to the v3.2.0 milestone Jan 20, 2020
@dstansby dstansby modified the milestones: v3.2.0, v3.1-doc Jan 21, 2020
@dstansby dstansby merged commit ef57d9e into matplotlib:master Jan 21, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Jan 21, 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.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 ef57d9ef82ec069f1093bc69e3db2b658a9407d0
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #16272: Move mplot3d autoregistration api changes to 3.2.'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-16272-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

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

@lumberbot-app
Copy link

lumberbot-app bot commented Jan 21, 2020

Something went wrong ... Please have a look at my logs.

It seem that the branch you are trying to backport to does not exists.

@anntzer anntzer deleted the mplot3dautoregister branch January 21, 2020 11:35
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Feb 13, 2020
@QuLogic
Copy link
Member

QuLogic commented Feb 13, 2020

Well, this isn't getting into 3.1.3, but might as well backport to fix the website.

@QuLogic
Copy link
Member

QuLogic commented Feb 13, 2020

@meeseeksdev backport to v3.2.x

meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Feb 13, 2020
dstansby added a commit that referenced this pull request Feb 13, 2020
…272-on-v3.2.x

Backport PR #16272 on branch v3.2.x (Move mplot3d autoregistration api changes to 3.2.)
@timhoffm
Copy link
Member

I think backporting to v3.2.x is enough.

tacaswell added a commit that referenced this pull request Feb 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

matplotlib 3.1.2: mplot3d must be explicitly imported to work
4 participants