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

DOC: Remove hint on PRs from origin/main#28638

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
timhoffm merged 1 commit intomatplotlib:mainfromtimhoffm:main
Aug 1, 2024

Conversation

timhoffm
Copy link
Member

@timhoffmtimhoffm commentedAug 1, 2024
edited
Loading

As poposed in#28575 (review), we don't need this. If developers have followed above instructions, they won't end up having changes on origin/main. But if they do, it's not really a problem on our side. We're still able to handle that. - As this PR shows, which I've intentionally made from my origin/main 😄 ping@story645

For an inexperienced user, it is simpler to continue with a PR from main rather than roll everything back and create a new PR.

The only problem exists on the user side in that they can't handle multiple concurrent changes when they only use main. But that's on them. And if they are inexperienced, they likely won't do that anyway.

@github-actionsgithub-actionsbot added the Documentation: devdocsfiles in doc/devel labelAug 1, 2024
@timhoffmtimhoffm added this to thev3.10.0 milestoneAug 1, 2024
@story645
Copy link
Member

story645 commentedAug 1, 2024
edited
Loading

This didn't fail our pre-commit?
ETA: am slightly concerned that our "don't push to main" pre-commit didn't fail :/

@tacaswell
Copy link
Member

you can either not installs it or explicitly skip it when committing (e.g. I'm currently getting spurious mypy failures via precommit locally (which I assume is mypy version issue due to virtualenv trying to be about 10% too clever and failing at its job) so I do every commit twice (once to let precommit fail and once skipping it to actually commit).

@timhoffm
Copy link
MemberAuthor

timhoffm commentedAug 1, 2024
edited
Loading

This didn't fail our pre-commit? ETA: am slightly concerned that our "don't push to main" pre-commit didn't fail :/

It failed the local pre-commit. I had to deactivate it to be able to commit to main 😄. Putting it the other way round: Precommit makes the case of the hint even less likely. One more argument to remove it 😆

@story645
Copy link
Member

story645 commentedAug 1, 2024
edited
Loading

Putting it the other way round: Precommit makes the case of the hint even less likely. One more argument to remove it 😆

So I try and make sure anything we do as a pre-commit we somewhat document in our workflow, which may be how this came in in the first place 😅

But also I think we use hints way too liberally and Juanita's suggestion of moving this down to "open a pull request" as an optional type of thing makes sense & can be removed from here for now.

Which the approval is self merge or move the sentence then self merge. 🤷‍♀️

@ksunden
Copy link
Member

The one way itcan roll onto slightly more problematic for us as maintainers is that PRs from main do not allow us to push to a contributor's branch (because default branch protections are in place). In my experience this is true even if github says "Maintainers are allowed to edit this pull request" because that is a separate layer of protection.

This isn'tthat much of a problem, but can mean a slight slow down for simple fixes we might otherwise just make and merge (e.g. typos etc). Just means we on occasion may have to wait for an extra round of the contributor responding, merge and open a followup, or open a PR from our own fork that branches from their main.

It is relatively rare that we want to do all of that at once, but can happen. However, overall, I kind of doubt this particular note significantly decreases the prevalence of doing this.

timhoffm reacted with thumbs up emoji

@timhoffmtimhoffm merged commitf4f40ba intomatplotlib:mainAug 1, 2024
25 checks passed
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@tacaswelltacaswelltacaswell approved these changes

@story645story645story645 approved these changes

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

Successfully merging this pull request may close these issues.

4 participants
@timhoffm@story645@tacaswell@ksunden

[8]ページ先頭

©2009-2025 Movatter.jp