Fix repo check: b1 is special and still made from main, not 3.x (#379)

Co-authored-by: Savannah Ostrowski <savannah@python.org>

Author: hugovk

release.py

@@ -193,7 +193,9 @@ def normalized(self) -> str:
 
     @property
     def branch(self) -> str:
-        return "main" if self.is_alpha_release else f"{self.major}.{self.minor}"
+        if self.is_alpha_release or self.is_feature_freeze_release:
+            return "main"
+        return f"{self.major}.{self.minor}"
 
     @property
     def is_alpha_release(self) -> bool:

run_release.py

@@ -1172,8 +1172,13 @@ def post_release_tagging(db: ReleaseShelf) -> None:
         cwd=db["git_repo"],
     )
 
+    if release_tag.is_feature_freeze_release:
+        checkout_branch = release_tag.basic_version
+    else:
+        checkout_branch = release_tag.branch
+
     subprocess.check_call(
-        ["git", "checkout", release_tag.branch],
+        ["git", "checkout", checkout_branch],
         cwd=db["git_repo"],
     )
 
@@ -1249,7 +1254,7 @@ def branch_new_versions(db: ReleaseShelf) -> None:
     subprocess.check_call(["git", "checkout", "main"], cwd=db["git_repo"])
 
     subprocess.check_call(
-        ["git", "checkout", "-b", release_tag.branch],
+        ["git", "checkout", "-b", release_tag.basic_version],
         cwd=db["git_repo"],
     )
 

tests/test_release_tag.py

@@ -41,26 +41,31 @@ def test_tag_phase() -> None:
     assert alpha.is_feature_freeze_release is False
     assert alpha.is_release_candidate is False
     assert alpha.is_final is False
+    assert alpha.branch == "main"
 
     assert beta1.is_alpha_release is False
     assert beta1.is_feature_freeze_release is True
     assert beta1.is_release_candidate is False
     assert beta1.is_final is False
+    assert beta1.branch == "main"
 
     assert beta4.is_alpha_release is False
     assert beta4.is_feature_freeze_release is False
     assert beta4.is_release_candidate is False
     assert beta4.is_final is False
+    assert beta4.branch == "3.13"
 
     assert rc.is_alpha_release is False
     assert rc.is_feature_freeze_release is False
     assert rc.is_release_candidate is True
     assert rc.is_final is False
+    assert rc.branch == "3.13"
 
     assert final.is_alpha_release is False
     assert final.is_feature_freeze_release is False
     assert final.is_release_candidate is False
     assert final.is_final is True
+    assert final.branch == "3.13"
 
 
 def test_tag_committed_at_not_found() -> None:

tests/test_run_release.py

@@ -59,7 +59,9 @@ def test_invalid_extract_github_owner() -> None:
     [
         # Success cases
         ("3.15.0rc1", "3.15\n", does_not_raise()),
-        ("3.15.0b1", "3.15\n", does_not_raise()),
+        ("3.15.0b3", "3.15\n", does_not_raise()),
+        ("3.15.0b2", "3.15\n", does_not_raise()),
+        ("3.15.0b1", "main\n", does_not_raise()),
         ("3.15.0a6", "main\n", does_not_raise()),
         ("3.14.3", "3.14\n", does_not_raise()),
         ("3.13.12", "3.13\n", does_not_raise()),
@@ -71,8 +73,8 @@ def test_invalid_extract_github_owner() -> None:
         ),
         (
             "3.15.0b1",
-            "main\n",
-            pytest.raises(ReleaseException, match="on main branch, expected 3.15"),
+            "3.15\n",
+            pytest.raises(ReleaseException, match="on 3.15 branch, expected main"),
         ),
         (
             "3.15.0a6",