Fix template sync

scripts/src/scverse_template_scripts/cruft_prs.py

@@ -110,10 +110,15 @@ def body(self) -> str:
             template_usage="https://cookiecutter-scverse-instance.readthedocs.io/en/latest/template_usage.html",
         )
 
-    def matches(self, pr: PullRequest) -> bool:
+    def matches_prefix(self, pr: PullRequest) -> bool:
+        """Check if `pr` is either a current or previous template update PR by matching the branch name"""
         # Don’t compare title prefix, people might rename PRs
         return pr.head.ref.startswith(self.branch_prefix) and pr.user.id == self.con.user.id
 
+    def matches_current_version(self, pr: PullRequest) -> bool:
+        """Check if `pr` is a template update PR for the current version"""
+        return pr.head.ref == self.branch and pr.user.id == self.con.user.id
+
 
 class RepoInfo(TypedDict):
     url: str
@@ -217,6 +222,11 @@ def make_pr(con: GitHubConnection, release: GHRelease, repo_url: str) -> None:
     # create fork, populate branch, do PR from it
     origin = con.gh.get_repo(repo_url.removeprefix("https://github.com/"))
     repo = get_fork(con, origin)
+
+    if old_pr := next((p for p in origin.get_pulls("open") if pr.matches_current_version(p)), None):
+        log.info(f"PR for current version already exists: #{pr.number} with branch name `{pr.head.ref}`. Skipping.")
+        return
+
     with TemporaryDirectory() as td:
         updated = cruft_update(
             con,
@@ -227,7 +237,8 @@ def make_pr(con: GitHubConnection, release: GHRelease, repo_url: str) -> None:
             path=Path(td),
         )
     if updated:
-        if old_pr := next((p for p in origin.get_pulls("open") if pr.matches(p)), None):
+        if old_pr := next((p for p in origin.get_pulls("open") if pr.matches_prefix(p)), None):
+            log.info(f"Closing old PR #{old_pr.number} with branch name `{pr.head.ref}`.")
             old_pr.edit(state="closed")
         origin.create_pull(pr.title, pr.body, origin.default_branch, pr.namespaced_head)
 
@@ -245,10 +256,17 @@ def main(tag_name: str) -> None:
     con = GitHubConnection("scverse-bot", token)
     release = get_template_release(con.gh, tag_name)
     repo_urls = get_repo_urls(con.gh)
+    failed = 0
     for repo_url in repo_urls:
-        # TODO just use single-repo we control for testing
-        if repo_url.endswith("icbi-lab/infercnvpy"):
-            make_pr(con, release, repo_url)
+        try:
+            # TODO just use single-repo we control for testing
+            if repo_url.endswith("icbi-lab/infercnvpy"):
+                make_pr(con, release, repo_url)
+        except Exception as e:
+            failed += 1
+            log.error(f"Error updating {repo_url}.", e)
+
+    sys.exit(failed > 0)
 
 
 def cli() -> None: