github-overlord 0.3.3__tar.gz → 0.4.1__tar.gz

{github_overlord-0.3.3 → github_overlord-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: github-overlord
-Version: 0.3.3
+Version: 0.4.1
 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)

{github_overlord-0.3.3 → github_overlord-0.4.1}/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,11 +43,35 @@ 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]":
@@ -86,7 +111,7 @@ def process_repo(repo, dry_run):
 
         pulls = repo.get_pulls(state="open")
 
-        if pulls.totalCount == 0:
+        if pulls.totalCount == 0 or pulls == NoneType:
             log.debug("no open prs, skipping")
             return
 
@@ -166,6 +191,23 @@ def pr_bumper():
     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.3 → github_overlord-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "github-overlord"
-version = "0.3.3"
+version = "0.4.1"
 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"