8000 Enforce pydocstyle D412 by timhoffm · Pull Request #14336 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Enforce pydocstyle D412 #14336

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
May 26, 2019
Merged

Enforce pydocstyle D412 #14336

merged 1 commit into from
May 26, 2019

Conversation

timhoffm
Copy link
Member

PR Summary

Enforce pydocstyle D412: No blank lines allowed between a section header and its content

@jklymak jklymak merged commit 9299bcc into matplotlib:master May 26, 2019
@timhoffm timhoffm deleted the pydocstyle-D412 branch May 27, 2019 05:18
@timhoffm timhoffm added this to the v3.1.1 milestone May 27, 2019
@timhoffm
Copy link
Member Author

@meeseeksdev backport to v3.1.1

These are only docstring style changes, but I think they should go back to reduce the risk of unnecessary conflicts when backporting some other docstring updates.

@lumberbot-app
Copy link
lumberbot-app bot commented May 27, 2019

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

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

@timhoffm
Copy link
Member Author

@meeseeksdev backport to v3.1.x

@lumberbot-app
Copy link
lumberbot-app bot commented May 27, 2019

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 9299bccd4eef00af574fb8f9bc7d7c7cdc65d888
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #14336: Enforce pydocstyle D412'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-14336-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #14336 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.

@timhoffm
Copy link
Member Author

Ok, there's already too much other docstring stuff missing in v3.1.x. Not trying to backport for now. 😞

@timhoffm timhoffm modified the milestones: v3.1.1, v3.2.0 May 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuLogic QuLogic QuLogic approved these changes

@jklymak jklymak jklymak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.2.0
Development

Successfully merging this pull request may close these issues.
3 participants
@timhoffm @QuLogic @jklymak
0