Skip to content
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

[3.11] gh-101100: Fix Py_DEBUG dangling Sphinx references (#115003) #115141

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

smontanaro
Copy link
Contributor

@smontanaro smontanaro commented Feb 7, 2024

No change to 3.11 branch for Doc/library/test.rst because the relevant section was new in 3.12.


📚 Documentation preview 📚: https://cpython-previews--115141.org.readthedocs.build/

@AlexWaygood AlexWaygood changed the title Backport d0322fd 3.11 [3.11] gh-101100: Fix Py_DEBUG dangling Sphinx references (#115003) Feb 7, 2024
@AlexWaygood
Copy link
Member

@smontanaro, please make sure to select the correct base branch when creating backport PRs. If you try to merge a 3.11 backport PR into the main branch (what you originally did here), you end up pinging all active core developers due to how GitHub's CODEOWNERS feature works :)

@AlexWaygood AlexWaygood closed this Feb 7, 2024
@AlexWaygood AlexWaygood reopened this Feb 7, 2024
@AlexWaygood AlexWaygood enabled auto-merge (squash) February 7, 2024 17:13
@AlexWaygood AlexWaygood merged commit e1e4cf7 into python:3.11 Feb 7, 2024
23 checks passed
@smontanaro
Copy link
Contributor Author

@smontanaro, please make sure to select the correct base branch when creating backport PRs. If you try to merge a 3.11 backport PR into the main branch (what you originally did here), you end up pinging all active core developers due to how GitHub's CODEOWNERS feature works :)

I was on my 3.11 branch. In addition, the cherry_picker command includes the branch on the command line. I have no idea why the PR in GitHub is against the main branch. I think I'm doing everything right.

@zware
Copy link
Member

zware commented Feb 7, 2024

The branch was created correctly, based on 3.11. The the PR was not, though, its base branch was main (GitHub is not aware enough to care about long-lived branches and thus choose the correct base branch on its own). How are you opening the PR? If it's cherry_picker opening it on its own (I can't remember whether it does that, it hasn't been working for me for other reasons lately :) ), it may have a bug.

@smontanaro
Copy link
Contributor Author

The branch was created correctly, based on 3.11. The PR was not, though, its base branch was main...

Ah, that's the problem. It hadn't occurred to me that there was a choice to make at that step. I thought everything would just be correct. The first time I even tried to make a PR against anything but main was a few days ago. I clearly need to up my game in this regard. Apologies for the problem.

@terryjreedy
Copy link
Member

terryjreedy commented Feb 8, 2024

This sort of splat is common enough that must of us now know to check further emails to see if someone has already handled it before even clicking to do anything. Please keep contributing.

This one was solved by re-basing and close/open to restart tests. Force-pushing sometimes results in a mess that requires closing and starting over with a new PR.

Alex, Zachary: could we ask GH to add a way to clear the reviewer request list? Or either question or refuse to create PRs like this? Or add a hook that calls our code before making the PR? EDIT Or have we tried already?

@AlexWaygood
Copy link
Member

This sort of splat is common enough that must of us now know to check further emails to see if someone has already handled it before even clicking to do anything. Please keep contributing.

+1. Apologies if my first message was overly critical, @smontanaro :)

Alex, Zachary: could we ask GH to add a way to clear the reviewer request list? Or either question or refuse to create PRs like this? Or add a hook that calls our code before making the PR? EDIT Or have we tried already?

I recall us giving some informal feedback to GitHub some time ago that it would be nice to introduce some more friction to the PR-making process, to make this kind of thing less common. But I don't know that anything came of it; it might well be worth trying again

@smontanaro
Copy link
Contributor Author

No worries. You didn't put me off... In fact:

https://discuss.python.org/t/dis-py-stack-append-vs-stack-push/45330

@smontanaro smontanaro deleted the backport-d0322fd-3.11 branch March 13, 2024 00:54
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.

4 participants