Skip to content

Remove extraneous if 1 statements in demo_axisline_style.py #12222

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 7 commits into from
Sep 25, 2018
Merged

Remove extraneous if 1 statements in demo_axisline_style.py #12222

merged 7 commits into from
Sep 25, 2018

Conversation

abhinuvpitale
Copy link
Contributor

@abhinuvpitale abhinuvpitale commented Sep 23, 2018

removed the confusing if 1: as propsed in #12191

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

removed the confusing if 1: as propsed in #12191
@abhinuvpitale
Copy link
Contributor Author

I am yet to change the other one, will add that commit here too!

@jklymak jklymak changed the title change proposed in issue #12191 Remove extraneous if 1 statements in demo_axisline_style.py Sep 23, 2018
@jklymak
Copy link
Member

jklymak commented Sep 23, 2018

Took liberty of making a more descriptive title. ...

@abhinuvpitale
Copy link
Contributor Author

updated with changes

Copy link
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

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

Thanks. Apart from the minor style issue, this looks good.

Copy link
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

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

Looks good to me. Let's see if CI agrees.

@abhinuvpitale
Copy link
Contributor Author

@QuLogic Did you mean something like this?
I thought sequential viewing might be better, but yeah this also makes sense!

@QuLogic
Copy link
Member

QuLogic commented Sep 24, 2018

Yes, that is fine. You have some flake8 errors though:

./examples/event_handling/pick_event_demo.py:106:1: W293 blank line contains whitespace
./examples/event_handling/pick_event_demo.py:148:1: W293 blank line contains whitespace
./examples/event_handling/pick_event_demo.py:163:1: W293 blank line contains whitespace
./examples/event_handling/pick_event_demo.py:164:18: W291 trailing whitespace
./examples/event_handling/pick_event_demo.py:182:1: W293 blank line contains whitespace
1     W291 trailing whitespace
4     W293 blank line contains whitespace

@QuLogic QuLogic merged commit 02abf44 into matplotlib:master Sep 25, 2018
@QuLogic QuLogic modified the milestones: v3.1, v3.0.x Sep 25, 2018
@QuLogic
Copy link
Member

QuLogic commented Sep 25, 2018

@meeseeksdev backport to v3.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 25, 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 02abf442ca5f0109fcbbd9e779f0f7bfe2348f24
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #12222: Remove extraneous if 1 statements in demo_axisline_style.py'
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-12222-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

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

@QuLogic
Copy link
Member

QuLogic commented Sep 25, 2018

Meh, I don't see the need.

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.

5 participants