Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
tacaswell merged 3 commits intomatplotlib:mainfromkolibril13:module_docs
Feb 9, 2023

Conversation

kolibril13
Copy link
Contributor

@kolibril13kolibril13 commentedFeb 5, 2023
edited
Loading

@tacaswelltacaswell added this to thev3.7.0 milestoneFeb 6, 2023
@jklymak
Copy link
Member

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

@jklymak Flake8 will never get this error, as flake8 isonly 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 beW291 (from pycodestyle), which is selected by our flake8 config.

jklymak and kolibril13 reacted with thumbs up emoji

Co-authored-by: Kyle Sunden <git@ksunden.space>
@tacaswelltacaswell merged commit91d8f2e intomatplotlib:mainFeb 9, 2023
@lumberbot-app
Copy link

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.xgit 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 theStill Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free tosuggest an improvement.

@tacaswell
Copy link
Member

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

kolibril13 reacted with thumbs up emoji

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@ksundenksundenksunden left review comments

@tacaswelltacaswelltacaswell approved these changes

Assignees
No one assigned
Projects
None yet
Milestone
v3.8.0
Development

Successfully merging this pull request may close these issues.

5 participants
@kolibril13@jklymak@ksunden@tacaswell@story645

[8]ページ先頭

©2009-2025 Movatter.jp