github-rest-api 0.47.2__tar.gz → 0.48.0__tar.gz

{github_rest_api-0.47.2/github_rest_api/scripts/github → github_rest_api-0.48.0/.github}/workflows/auto_merge_pull_request.yaml

@@ -27,4 +27,5 @@ jobs:
           uvx --from github-rest-api@latest auto_merge_pull_request \
             --authors dclong \
             --approvers dclong 'claude[bot]' 'gemini-code-assist[bot]' \
+            --marker 'AUTO_MERGE_APPROVED' \
             --token ${{ secrets.ACTIONS_TOKEN }}

{github_rest_api-0.47.2 → github_rest_api-0.48.0}/.github/workflows/claude-code-review.yml

@@ -21,8 +21,8 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      pull-requests: read
-      issues: read
+      pull-requests: write
+      issues: write
       id-token: write
 
     steps:
@@ -36,6 +36,13 @@ jobs:
         uses: anthropics/claude-code-action@v1
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          # Post the review comment with a token that has write access. Using the
+          # ACTIONS_TOKEN PAT also makes the comment (and its AUTO_MERGE_APPROVED
+          # marker) come from dclong, who is in the auto-merge approver allowlist.
+          github_token: ${{ secrets.ACTIONS_TOKEN }}
+          # Force tag mode so the action creates and updates a PR comment with the
+          # review; without this the code-review run posts nothing.
+          track_progress: true
           plugin_marketplaces: 'https://github.com/anthropics/claude-code.git'
           plugins: 'code-review@claude-code-plugins'
           prompt: |
@@ -45,12 +52,10 @@ jobs:
             When the review is finished, decide whether this PR is safe to merge
             automatically: it is safe only if the review surfaced no correctness bugs
             and no other blocking issues (non-blocking style or cleanup suggestions do
-            not disqualify it). If and only if it is safe, post a single new comment on
-            the pull request whose body includes, on its own line, this exact marker
-            (a short note such as "Approved for auto-merge." above it is fine):
-            <!-- auto-merge: approved -->
-            If you found any blocking issue, do NOT post the marker. Always post a fresh
-            comment rather than editing an existing one, so the marker's timestamp
-            follows the latest commit.
+            not disqualify it). If and only if it is safe, end your review with this
+            token alone on its own final line, exactly and verbatim:
+            AUTO_MERGE_APPROVED
+            Do not write this token anywhere else in your review, and do not write it
+            at all if you found any blocking issue.
           # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
           # or https://code.claude.com/docs/en/cli-reference for available options

{github_rest_api-0.47.2 → github_rest_api-0.48.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: github-rest-api
-Version: 0.47.2
+Version: 0.48.0
 Summary: Simple wrapper of GitHub REST APIs.
 Author-email: Ben Du <longendu@yahoo.com>
 Classifier: Programming Language :: Python :: 3 :: Only

{github_rest_api-0.47.2 → github_rest_api-0.48.0}/github_rest_api/github.py

@@ -31,9 +31,9 @@ DEFAULT_PR_MODEL = "anthropic/claude-haiku-4-5-20251001"
 # Defaults for automatic pull request merging (see Repository.auto_merge_pull_requests).
 # A marker comment from an allowlisted approver is accepted as an approval signal
 # for AI reviewers that only comment instead of submitting a formal review.
-DEFAULT_AUTO_MERGE_MARKER = "<!-- auto-merge: approved -->"
+DEFAULT_AUTO_MERGE_MARKER = "AUTO_MERGE_APPROVED"
 # Conventional-commit title types eligible for auto-merge.
-DEFAULT_AUTO_MERGE_TYPES = ("chore", "docs", "deps")
+DEFAULT_AUTO_MERGE_TYPES = ("build", "chore", "ci", "docs", "deps")
 # A PR is only auto-merged once its head commit is at least this old, an anti-race
 # guard so a PR that momentarily reads `clean` before CI registers is not merged.
 # A just-created PR is simply deferred to the next run, never dropped, so a small
@@ -177,8 +177,15 @@ def _field_gate_failure(
         return "it is a draft"
     if not _in_allowlist(_login(pr), _normalized_logins(authors)):
         return "its author is not in the allowlist"
-    if not _title_type_allowed(pr.get("title") or "", allowed_types):
-        return "its title type is not auto-merge eligible"
+    title = pr.get("title") or ""
+    if not _title_type_allowed(title, allowed_types):
+        type_ = _conventional_type(title)
+        current = f"'{type_}'" if type_ is not None else "missing/unrecognized"
+        eligible = ", ".join(allowed_types) or "none"
+        return (
+            f"its title type ({current}) is not auto-merge eligible "
+            f"(eligible types: {eligible})"
+        )
     return None
 
 

{github_rest_api-0.47.2 → github_rest_api-0.48.0}/github_rest_api/scripts/github/create_github_repo.py

@@ -67,8 +67,12 @@ def _init_local_repo(
     dir_: str,
     token: str,
     protocol: str,
+    push: bool,
     branches: Sequence[str] = ("main",),
 ) -> None:
+    branches = list(dict.fromkeys(branches))
+    if not branches:
+        raise ValueError("At least one branch must be specified.")
     repo_name = repo.split("/")[-1]
     path = Path(dir_) if dir_ else Path(repo_name)
     path.mkdir(parents=True, exist_ok=True)
@@ -94,21 +98,26 @@ def _init_local_repo(
         if initial_branch not in branches:
             porcelain.branch_delete(repo=path, name=initial_branch)
             logger.info("Deleted initial branch '%s'", initial_branch)
+    else:
+        existing_branches = {b.decode() for b in porcelain.branch_list(path)}
+        for branch in branches:
+            if branch not in existing_branches:
+                porcelain.branch_create(repo=path, name=branch)
+                logger.info("Created branch '%s' from HEAD", branch)
     _ensure_remote(path, repo, protocol)
-    local_branches = {b.decode() for b in porcelain.branch_list(path)}
-    branches_to_push = [branch for branch in branches if branch in local_branches]
-    if not branches_to_push:
-        branches_to_push = [_active_branch(path)]
-    for branch in branches_to_push:
-        logger.info("Pushing branch '%s' to remote '%s'...", branch, repo)
-        porcelain.push(
-            repo=path,
-            remote_location=_remote_url(repo, "https"),
-            refspecs=[branch.encode()],
-            username="x-access-token",
-            password=token,
-        )
-        logger.info("Successfully pushed branch '%s'.", branch)
+    if push:
+        for branch in branches:
+            logger.info("Pushing branch '%s' to remote '%s'...", branch, repo)
+            porcelain.push(
+                repo=path,
+                remote_location=_remote_url(repo, "https"),
+                refspecs=[branch.encode()],
+                username="x-access-token",
+                password=token,
+            )
+            logger.info("Successfully pushed branch '%s'.", branch)
+    else:
+        logger.info("Skipping push (pass --push to push branches to the remote).")
     _add_workflow(path, language)
 
 
@@ -120,6 +129,7 @@ def create_github_repo(
     dir_: str,
     token: str,
     protocol: str,
+    push: bool,
     branches: Sequence[str] = ("main",),
 ) -> None:
     token = token or os.getenv("GITHUB_TOKEN", "")
@@ -141,6 +151,7 @@ def create_github_repo(
         token=token,
         branches=branches,
         protocol=protocol,
+        push=push,
     )
 
 
@@ -223,7 +234,7 @@ def parse_args(args=None, namespace=None):
         nargs="+",
         default=["main"],
         metavar="BRANCH",
-        help="Branches to create and push to remote (default: main).",
+        help="Branches to create (and push if --push is set) (default: main).",
     )
     parser.add_argument(
         "--https",
@@ -233,6 +244,12 @@ def parse_args(args=None, namespace=None):
         default="git",
         help="Use the HTTPS protocol for the remote URL.",
     )
+    parser.add_argument(
+        "--push",
+        dest="push",
+        action="store_true",
+        help="Push branches to the remote (by default, nothing is pushed).",
+    )
     parser.add_argument(
         "-v",
         "--verbose",
@@ -256,6 +273,7 @@ def main() -> int:
             token=args.token,
             branches=args.branches,
             protocol=args.protocol,
+            push=args.push,
         )
     except Exception as e:
         logger.error("Failed to create GitHub repo: %s", e, exc_info=args.verbose)

{github_rest_api-0.47.2 → github_rest_api-0.48.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "hatchling" ]
 
 [project]
 name = "github-rest-api"
-version = "0.47.2"
+version = "0.48.0"
 description = "Simple wrapper of GitHub REST APIs."
 readme = "README.md"
 authors = [ { name = "Ben Du", email = "longendu@yahoo.com" } ]

{github_rest_api-0.47.2 → github_rest_api-0.48.0}/tests/test_github.py

@@ -525,7 +525,7 @@ def test_should_auto_merge_marker_comment_path():
         comments=[
             {
                 "user": {"login": "bot"},
-                "body": "<!-- auto-merge: approved -->",
+                "body": "AUTO_MERGE_APPROVED",
                 # Posted after the head commit (which _auto_merge_repo dates 30 min ago).
                 "created_at": datetime.now(timezone.utc).isoformat(),
             }
@@ -543,7 +543,7 @@ def test_should_auto_merge_skips_marker_comment_before_head_commit():
         comments=[
             {
                 "user": {"login": "bot"},
-                "body": "<!-- auto-merge: approved -->",
+                "body": "AUTO_MERGE_APPROVED",
                 "created_at": (
                     datetime.now(timezone.utc) - timedelta(hours=1)
                 ).isoformat(),
@@ -593,7 +593,7 @@ def test_should_auto_merge_changes_requested_vetoes_marker_comment():
     # left an approving marker comment.
     repo, patches = _auto_merge_repo(
         reviews=[_review("bot", "CHANGES_REQUESTED")],
-        comments=[{"user": {"login": "bot"}, "body": "<!-- auto-merge: approved -->"}],
+        comments=[{"user": {"login": "bot"}, "body": "AUTO_MERGE_APPROVED"}],
     )
     assert _run_should_auto_merge(repo, patches) is None
 

{github_rest_api-0.47.2 → github_rest_api-0.48.0}/uv.lock

@@ -542,7 +542,7 @@ wheels = [
 
 [[package]]
 name = "github-rest-api"
-version = "0.47.2"
+version = "0.48.0"
 source = { editable = "." }
 dependencies = [
     { name = "dulwich" },