Fix repo check: b1 is special and still made from main, not 3.x#379
Open
hugovk wants to merge 4 commits intopython:mainfrom
Open
Fix repo check: b1 is special and still made from main, not 3.x#379hugovk wants to merge 4 commits intopython:mainfrom
hugovk wants to merge 4 commits intopython:mainfrom
Conversation
savannahostrowski
approved these changes
May 7, 2026
Member
savannahostrowski
left a comment
There was a problem hiding this comment.
A stylistic nit which you can take or leave as is, but this looks right to me!
Co-authored-by: Savannah Ostrowski <savannah@python.org>
Member
Author
|
Two new commits, followup bug when trying to make the new ✅ Merge the tag into the release branch
Already on 'main'
Your branch is ahead of 'origin/main' by 1 commit.
(use "git push" to publish your local commits)
fatal: a branch named 'main' already exists
💥 Branch out new versions and prepare main branch
Traceback (most recent call last):
File "/Users/hugo/github/release-tools/run_release.py", line 1483, in <module>
main()
~~~~^^
File "/Users/hugo/github/release-tools/run_release.py", line 1479, in main
automata.run()
~~~~~~~~~~~~^^
File "/Users/hugo/github/release-tools/run_release.py", line 281, in run
raise e from None
File "/Users/hugo/github/release-tools/run_release.py", line 278, in run
self.current_task(self.db)
~~~~~~~~~~~~~~~~~^^^^^^^^^
File "/Users/hugo/github/release-tools/release.py", line 151, in __call__
return getattr(self, "function")(db)
~~~~~~~~~~~~~~~~~~~~~~~~~^^^^
File "/Users/hugo/github/release-tools/run_release.py", line 1247, in branch_new_versions
subprocess.check_call(
~~~~~~~~~~~~~~~~~~~~~^
["git", "checkout", "-b", release_tag.branch],
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
cwd=db["git_repo"],
^^^^^^^^^^^^^^^^^^^
)
^
File "/Library/Frameworks/Python.framework/Versions/3.14/lib/python3.14/subprocess.py", line 420, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'checkout', '-b', 'main']' returned non-zero exit status 128.From here: def branch_new_versions(db: ReleaseShelf) -> None:
release_tag: release_mod.Tag = db["release"]
if not release_tag.is_feature_freeze_release:
return
subprocess.check_call(["git", "checkout", "main"], cwd=db["git_repo"])
subprocess.check_call(
["git", "checkout", "-b", release_tag.branch],
cwd=db["git_repo"],
)This is a feature freeze, we don't return early. But the new branch should be And a similar change in |
sethmlarson
approved these changes
May 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix the check added in #334:
Beta 1 is special: like all alphas, we start from the
mainbranch. At the end of b1, the next3.xbranch is created, and then that will be used for b2 and later.