Fix template sync

.github/workflows/cruft-prs.yml

@@ -30,3 +30,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.BOT_GH_TOKEN }}
           FORCE_COLOR: "1"
           COLUMNS: "150"
+      - uses: actions/upload-artifact@v3
+        with:
+          name: cruft-logs
+          path: log/

.github/workflows/test.yaml

@@ -5,8 +5,6 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
-  schedule:
-    - cron: "0 5 1,15 * *"
 
 defaults:
   run:

scripts/pyproject.toml

@@ -23,6 +23,7 @@ dependencies = [
     "GitPython",
     "PyGitHub",
     "PyYAML",
+    "pre-commit"
 ]
 
 [project.optional-dependencies]

scripts/src/scverse_template_scripts/cruft_prs.py

@@ -29,6 +29,8 @@
 from .backoff import retry_with_backoff
 
 log = getLogger(__name__)
+log_dir = Path("./log")
+log_dir.mkdir(exist_ok=True)
 
 PR_BODY_TEMPLATE = """\
 `cookiecutter-scverse` released [{release.tag_name}]({release.html_url}).
@@ -86,6 +88,7 @@ def auth(self, url_str: str) -> str:
 class PR:
     con: GitHubConnection
     release: GHRelease
+    repo_id: str  # something like grst-infercnvpy
 
     title_prefix: ClassVar[LiteralString] = "Update template to "
     branch_prefix: ClassVar[LiteralString] = "template-update-"
@@ -96,7 +99,7 @@ def title(self) -> str:
 
     @property
     def branch(self) -> str:
-        return f"{self.branch_prefix}{self.release.tag_name}"
+        return f"{self.branch_prefix}{self.repo_id}-{self.release.tag_name}"
 
     @property
     def namespaced_head(self) -> str:
@@ -138,9 +141,18 @@ def get_repo_urls(gh: Github) -> Generator[str]:
             yield repo["url"]
 
 
-def run_cruft(cwd: Path) -> CompletedProcess:
-    args = [sys.executable, "-m", "cruft", "update", "--checkout=main", "--skip-apply-ask", "--project-dir=."]
-    return run(args, check=True, cwd=cwd)
+def run_cruft(cwd: Path, git_tag: str, log_name: str) -> CompletedProcess:
+    args = [
+        sys.executable,
+        "-m",
+        "cruft",
+        "update",
+        f"--checkout={git_tag}",
+        "--skip-apply-ask",
+        "--project-dir=.",
+    ]
+    with open(log_dir / f"{log_name}.txt", "w") as log_file:
+        return run(args, check=True, cwd=cwd, stdout=log_file, stderr=log_file)
 
 
 # GitHub says that up to 5 minutes of wait are OK,
@@ -149,14 +161,20 @@ def run_cruft(cwd: Path) -> CompletedProcess:
 # Due to exponential backoff, we’ll maximally wait 2⁹ sec, or 8.5 min
 
 
-def cruft_update(con: GitHubConnection, repo: GHRepo, path: Path, pr: PR) -> bool:
+def cruft_update(  # noqa: PLR0913
+    con: GitHubConnection, tag_name: str, repo: GHRepo, origin: GHRepo, path: Path, pr: PR
+) -> bool:
     clone = retry_with_backoff(
-        lambda: Repo.clone_from(con.auth(repo.clone_url), path), retries=n_retries, exc_cls=GitCommandError
+        lambda: Repo.clone_from(con.auth(repo.clone_url), path),
+        retries=n_retries,
+        exc_cls=GitCommandError,
     )
-    branch = clone.create_head(pr.branch, clone.active_branch)
+    upstream = clone.create_remote(name=pr.repo_id, url=origin.clone_url)
+    upstream.fetch()
+    branch = clone.create_head(pr.branch, f"{pr.repo_id}/{origin.default_branch}")
     branch.checkout()
 
-    run_cruft(path)
+    run_cruft(path, tag_name, pr.branch)
 
     if not clone.is_dirty():
         return False
@@ -176,21 +194,23 @@ def cruft_update(con: GitHubConnection, repo: GHRepo, path: Path, pr: PR) -> boo
 
 
 def get_fork(con: GitHubConnection, repo: GHRepo) -> GHRepo:
-    if fork := next((f for f in repo.get_forks() if f.owner.id == con.user.id), None):
-        return fork
+    """Fork target repo into the scverse-bot namespace and wait until the fork has been created.
+    If the fork already exists it is reused.
+    """
     fork = repo.create_fork()
     return retry_with_backoff(lambda: con.gh.get_repo(fork.id), retries=n_retries, exc_cls=UnknownObjectException)
 
 
 def make_pr(con: GitHubConnection, release: GHRelease, repo_url: str) -> None:
-    pr = PR(con, release)
-    log.info(f"Sending PR to {repo_url}: {pr.title}")
+    repo_id = repo_url.replace("https://github.com/", "").replace("/", "-")
+    pr = PR(con, release, repo_id)
+    log.info(f"Sending PR to {repo_url} : {pr.title}")
 
     # create fork, populate branch, do PR from it
     origin = con.gh.get_repo(repo_url.removeprefix("https://github.com/"))
     repo = get_fork(con, origin)
     with TemporaryDirectory() as td:
-        updated = cruft_update(con, repo, Path(td), pr)
+        updated = cruft_update(con, release.tag_name, repo, origin, Path(td), pr)
     if updated:
         if old_pr := next((p for p in origin.get_pulls("open") if pr.matches(p)), None):
             old_pr.edit(state="closed")
@@ -211,7 +231,9 @@ def main(tag_name: str) -> None:
     release = get_template_release(con.gh, tag_name)
     repo_urls = get_repo_urls(con.gh)
     for repo_url in repo_urls:
-        make_pr(con, release, repo_url)
+        # TODO just use single-repo we control for testing
+        if repo_url.endswith("icbi-lab/infercnvpy"):
+            make_pr(con, release, repo_url)
 
 
 def cli() -> None:

scripts/tests/test_cruft.py

@@ -15,6 +15,7 @@
 class MockGHRepo:
     git_url: str  # git://github.com/foo/bar.git
     clone_url: str  # https://github.com/foo/bar.git
+    default_branch: str  # main
 
 
 @dataclass
@@ -39,18 +40,21 @@ def repo(git_repo: GitRepo) -> GHRepo:
     (git_repo.workspace / "b").write_text("b content")
     git_repo.api.index.add(["a", "b"])
     git_repo.api.index.commit("initial commit")
-    return cast(GHRepo, MockGHRepo(git_repo.uri, git_repo.uri))
+    return cast(GHRepo, MockGHRepo(git_repo.uri, git_repo.uri, "main"))
 
 
 @pytest.fixture
 def pr(con) -> PR:
-    return PR(con, cast(GHRelease, MockRelease()))
+    return PR(con, cast(GHRelease, MockRelease()), "scverse-test")
 
 
 def test_cruft_update(con, repo, tmp_path, pr, git_repo: GitRepo, monkeypatch: pytest.MonkeyPatch):
     old_active_branch_name = git_repo.api.active_branch.name
-    monkeypatch.setattr("scverse_template_scripts.cruft_prs.run_cruft", lambda p: (p / "b").write_text("b modified"))
-    changed = cruft_update(con, repo, tmp_path, pr)
+    monkeypatch.setattr(
+        "scverse_template_scripts.cruft_prs.run_cruft",
+        lambda p, _, __: (p / "b").write_text("b modified"),
+    )
+    changed = cruft_update(con, "main", repo, repo, tmp_path, pr)
     assert changed  # TODO: add test for short circuit
     main_branch = git_repo.api.active_branch
     assert main_branch.name == old_active_branch_name, "Shouldn’t change active branch"

{{cookiecutter.project_name}}/.github/workflows/test.yaml

@@ -5,6 +5,8 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  schedule:
+    - cron: "0 5 1,15 * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

{{cookiecutter.project_name}}/.pre-commit-config.yaml

@@ -39,6 +39,9 @@ repos:
         args: [--fix=lf]
       - id: trailing-whitespace
       - id: check-case-conflict
+      # Check that there are no merge conflicts (could be generated by template sync)
+      - id: check-merge-conflict
+        args: [--assume-in-merge]
   - repo: local
     hooks:
       - id: forbid-to-commit