8000 Make boilerplate-generated pyplot.py flake8 compliant by timhoffm · Pull Request #12236 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]

Skip to content

Make boilerplate-generated pyplot.py flake8 compliant #12236

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
Sep 23, 2018

Conversation

timhoffm
Copy link
Member

PR Summary

This does two things:

  • Correct the number of lines between boilerplate functions (E302).
  • Add # noqa to lines like if isinstance(__ret, cm.ScalarMappable): sci(__ret).
    flake 8 complains that this should be wrapped (E701). However that's cumbersome to get a correct indentation. Since these are just 5 cases and it's in autogenerated code, which likely nobody will read anyway, I prefer the explicit exclusion of these lines compared to deactivating E701 for the whole file.

PR Checklist

# Autogenerated by boilerplate.py. Do not edit as changes will be lost."""

CMAPPABLE_TEMPLATE = AUTOGEN_MSG + """
CMAPPABLE_TEMPLATE = AUTOGEN_MSG + """
Copy link
Contributor

Choose a reason for hiding this comment

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

Why'd we pick up a space here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry, typo.

@timhoffm timhoffm added this to the v3.0.x milestone Sep 23, 2018
@dopplershift dopplershift merged commit f8bda74 into matplotlib:master Sep 23, 2018
@lumberbot-app
Copy link
lumberbot-app bot commented Sep 23, 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 f8bda747c8d6410323498e331a029fb90ef492d1
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12236: Make boilerplate-generated pyplot.py flake8 compliant'
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-12236-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

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

timhoffm pushed a commit to timhoffm/matplotlib that referenced this pull request Sep 23, 2018
@timhoffm timhoffm deleted the boilerplate-flake8 branch September 23, 2018 20:44
timhoffm pushed a commit to timhoffm/matplotlib that referenced this pull request Sep 24, 2018
dstansby added a commit that referenced this pull request Sep 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0