Skip to content

Small tweak in chapter sorting of the example gallery #25157

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 3 commits into from
Feb 9, 2023

Conversation

kolibril13
Copy link
Contributor

@kolibril13 kolibril13 commented Feb 5, 2023

@tacaswell tacaswell added this to the v3.7.0 milestone Feb 6, 2023
@jklymak
Copy link
Member

jklymak commented Feb 8, 2023

This is an example where the pre-commit hook catches something that flake8 does not. It would be nice if they were consistent. @kolibril13 this needs some whitespace fixes....

@ksunden
Copy link
Member

ksunden commented Feb 8, 2023

@jklymak Flake8 will never get this error, as flake8 is only about python source files.
Each pre-commit hook can be configured to run on specific files (the trailing whitespace one runs on all text files except SVGs)

This particular trailing whitespace is in a README.txt.

If it were in python source, it would be W291 (from pycodestyle), which is selected by our flake8 config.

Co-authored-by: Kyle Sunden <git@ksunden.space>
@tacaswell tacaswell merged commit 91d8f2e into matplotlib:main Feb 9, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented Feb 9, 2023

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.7.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 91d8f2e882bf6fc441276c64590a54d659f2c8a4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #25157: Small tweak in chapter sorting of the example gallery'
  1. Push to a named branch:
git push YOURFORK v3.7.x:auto-backport-of-pr-25157-on-v3.7.x
  1. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR #25157 on branch v3.7.x (Small tweak in chapter sorting of the example gallery)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@tacaswell
Copy link
Member

Even though it is a documentation change, I'm going to err on the side of not backporting.

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.

5 participants