github-overlord 0.3.2__tar.gz → 0.4.0__tar.gz

{github_overlord-0.3.2 → github_overlord-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: github-overlord
-Version: 0.3.2
+Version: 0.4.0
 Summary: Automatically merge Dependabot PRs in public repositories
 Home-page: https://github.com/iloveitaly/github-overlord
 Keywords: github,dependabot,automation
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: apscheduler (>=3.10.4,<4.0.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: funcy-pipe (>=0.11.0,<0.12.0)
+Requires-Dist: openai (>=1.33.0,<2.0.0)
 Requires-Dist: pygithub (>=2.3.0,<3.0.0)
 Requires-Dist: python-decouple-typed (>=3.11.0,<4.0.0)
 Requires-Dist: structlog (>=24.2.0,<25.0.0)
@@ -47,3 +48,7 @@ Options:
 ```
 
 ### Docker Cron
+
+There's a docker container you can use to run this on a cron. [Fits nicely into a orange pi.](https://mikebian.co/pi-hole-tailscale-and-docker-on-an-orange-pi/)
+
+Check out [docker-compose.yml](./docker-compose.yml) for an example, or `git pull ghcr.io/iloveitaly/github-overlord:latest`.

{github_overlord-0.3.2 → github_overlord-0.4.0}/README.md

@@ -26,4 +26,8 @@ Options:
   --help        Show this message and exit.
 ```
 
-### Docker Cron
+### Docker Cron
+
+There's a docker container you can use to run this on a cron. [Fits nicely into a orange pi.](https://mikebian.co/pi-hole-tailscale-and-docker-on-an-orange-pi/)
+
+Check out [docker-compose.yml](./docker-compose.yml) for an example, or `git pull ghcr.io/iloveitaly/github-overlord:latest`.

{github_overlord-0.3.2 → github_overlord-0.4.0}/github_overlord/__init__.py

@@ -1,6 +1,7 @@
 import os
 import re
 import time
+from types import NoneType
 
 import click
 import funcy_pipe as fp
@@ -42,13 +43,39 @@ def resolve_async_status(object, key):
             return
 
 
+def handle_stale_dependabot_pr(pr: PullRequest) -> None:
+    """
+    Handle a dependabot PR that has been open for at least 30 days and has conflicts
+    """
+
+    assert not pr.mergeable
+    assert pr.mergeable_state == "dirty"
+
+    if pr.body is None:
+        return
+
+    if "Automatic rebases have been disabled on this pull request" in pr.body:
+        log.info(
+            "PR has disabled automatic rebases, manually commenting", url=pr.html_url
+        )
+
+        pr.create_issue_comment("@dependabot rebase")
+
+
 def is_eligible_for_merge(pr: PullRequest):
     resolve_async_status(pr, "mergeable")
 
+    if pr.state == "closed":
+        log.debug("PR is closed", url=pr.html_url)
+        return
+
     if not pr.mergeable:
+        log.debug("PR is not mergeable", url=pr.html_url)
+        handle_stale_dependabot_pr(pr)
         return False
 
     if pr.user.login != "dependabot[bot]":
+        log.debug("PR is not from dependabot", url=pr.html_url)
         return False
 
     last_commit = pr.get_commits().reversed[0]
@@ -57,43 +84,51 @@ def is_eligible_for_merge(pr: PullRequest):
 
     # status is different than CI runs!
     if len(combined_status.statuses) > 0 and status != "success":
+        log.debug("PR has failed status", url=pr.html_url, status=status)
         return False
 
     # checks are the CI runs
     all_checks_successful = (
-        last_commit.get_check_runs() | fp.pluck_attr("conclusion") | fp.all("success")
+        last_commit.get_check_runs()
+        | fp.pluck_attr("conclusion")
+        | fp.all({"success", "skipped"})
     )
 
     if not all_checks_successful:
+        log.debug("PR has failed checks", url=pr.html_url)
         return False
 
     return True
 
 
 def process_repo(repo, dry_run):
-    log.debug("checking repository", repo=repo.full_name)
+    with log.context(repo=repo.full_name):
+        log.debug("checking repository")
 
-    if repo.fork:
-        log.debug("skipping forked repo")
-        return
+        if repo.fork:
+            log.debug("skipping forked repo")
+            return
 
-    pulls = repo.get_pulls(state="open")
+        pulls = repo.get_pulls(state="open")
 
-    if pulls.totalCount == 0:
-        log.debug("no open prs, skipping")
-        return
+        if pulls.totalCount == 0 or pulls == NoneType:
+            log.debug("no open prs, skipping")
+            return
 
-    merged_pr_count = 0
+        merged_pr_count = 0
 
-    for pr in pulls:
-        if is_eligible_for_merge(pr):
-            merge_pr(pr, dry_run)
+        for pr in pulls:
+            if is_eligible_for_merge(pr):
+                merge_pr(pr, dry_run)
 
-            merged_pr_count += 1
-        else:
-            log.debug("skipping PR", url=pr.html_url)
+                merged_pr_count += 1
+            else:
+                log.debug("skipping PR", url=pr.html_url)
 
-    log.info("merged prs", count=merged_pr_count)
+        if merged_pr_count == 0:
+            log.debug("no PRs were merged")
+        else:
+            log.info("merged prs", count=merged_pr_count)
 
 
 def main(token, dry_run, repo):
@@ -145,9 +180,34 @@ def dependabot(token, dry_run, repo):
 
 
 def pr_bumper():
+    """
+    Look at PRs which you have written:
+
+    1. There are bots out there which will close the PR if there are is no activity, even if there is no activity from
+       the maintainer. This will keep the PR open by adding a comment.
+    2. PRs that are not merged, been open for at least 30 days, with no comments from the maintainer.
+    """
+
     pass
 
 
+"""
+    token = token or os.getenv('GITHUB_TOKEN')
+    if not token:
+        raise ValueError("GitHub token must be provided either as an option or via the GITHUB_TOKEN environment variable")
+
+    g = Github(token)
+    user = g.get_user()
+    notifications = user.get_notifications()
+
+    for notification in notifications:
+        print(f"Notification: {notification.subject['title']}, Reason: {notification.reason}")
+        if not read_only:
+            notification.mark_as_read()
+
+"""
+
+
 cli.add_command(dependabot)
 
 if __name__ == "__main__":

{github_overlord-0.3.2 → github_overlord-0.4.0}/github_overlord/utils.py

@@ -64,7 +64,7 @@ def setup():
 
     configure_logger()
 
-    log.info("application setup")
+    log.debug("application setup")
 
     # local state in a method is strange, but it works :/
     setup.complete = True

{github_overlord-0.3.2 → github_overlord-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "github-overlord"
-version = "0.3.2"
+version = "0.4.0"
 description = "Automatically merge Dependabot PRs in public repositories"
 authors = ["Michael Bianco <mike@mikebian.co>"]
 readme = "README.md"
@@ -15,6 +15,7 @@ python-decouple-typed = "^3.11.0"
 funcy-pipe = "^0.11.0"
 structlog = "^24.2.0"
 apscheduler = "^3.10.4"
+openai = "^1.33.0"
 
 [tool.poetry.scripts]
 github-overlord = "github_overlord:cli"