Skip to content

Fix numpydoc formatting #12914

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 5, 2018
Merged

Fix numpydoc formatting #12914

merged 1 commit into from
Dec 5, 2018

Conversation

timhoffm
Copy link
Member

@timhoffm timhoffm commented Dec 1, 2018

PR Summary

Fixes #12907.

@timhoffm timhoffm added this to the v3.0.3 milestone Dec 1, 2018
@dstansby dstansby merged commit 73c3dce into matplotlib:master Dec 5, 2018
@lumberbot-app
Copy link

lumberbot-app bot commented Dec 5, 2018

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.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 73c3dce0589ff2b54bee636314bcf222977ff444
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12914: Fix numpydoc formatting'
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-12914-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

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

@Naereen
Copy link

Naereen commented Dec 5, 2018

LGTM!

@timhoffm timhoffm deleted the doc-typo branch December 5, 2018 21:24
timhoffm pushed a commit to timhoffm/matplotlib that referenced this pull request Dec 5, 2018
QuLogic added a commit that referenced this pull request Dec 6, 2018
…v3.0.x

Backport PR #12914 on branch 3.0.x: Fix numpydoc formatting
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.

4 participants