Feature: upgrade to newer githubkit

codegen/templates/_base.py.jinja

@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 from typing_extensions import override
 
 from nonebot.utils import escape_tag
@@ -12,7 +12,7 @@ from ..utils import get_attr_or_item
 class Event(BaseEvent):
     id: str
     name: str
-    payload: Dict[str, Any]
+    payload: dict[str, Any]
 
     to_me: bool = False
 

nonebot/adapters/github/event/__init__.py

@@ -257,6 +257,15 @@
     from .projects_v2_reopened import (
         ProjectsV2ProjectReopened as ProjectsV2ProjectReopened,
     )
+    from .projects_v2_status_update_created import (
+        ProjectsV2StatusUpdateCreated as ProjectsV2StatusUpdateCreated,
+    )
+    from .projects_v2_status_update_deleted import (
+        ProjectsV2StatusUpdateDeleted as ProjectsV2StatusUpdateDeleted,
+    )
+    from .projects_v2_status_update_edited import (
+        ProjectsV2StatusUpdateEdited as ProjectsV2StatusUpdateEdited,
+    )
     from .public import Public as Public
     from .pull_request_assigned import PullRequestAssigned as PullRequestAssigned
     from .pull_request_auto_merge_disabled import (
@@ -379,15 +388,15 @@
     from .secret_scanning_alert_location import (
         SecretScanningAlertLocationCreated as SecretScanningAlertLocationCreated,
     )
+    from .secret_scanning_alert_publicly_leaked import (
+        SecretScanningAlertPubliclyLeaked as SecretScanningAlertPubliclyLeaked,
+    )
     from .secret_scanning_alert_reopened import (
         SecretScanningAlertReopened as SecretScanningAlertReopened,
     )
     from .secret_scanning_alert_resolved import (
         SecretScanningAlertResolved as SecretScanningAlertResolved,
     )
-    from .secret_scanning_alert_revoked import (
-        SecretScanningAlertRevoked as SecretScanningAlertRevoked,
-    )
     from .secret_scanning_alert_validated import (
         SecretScanningAlertValidated as SecretScanningAlertValidated,
     )
@@ -416,6 +425,18 @@
     from .star_created import StarCreated as StarCreated
     from .star_deleted import StarDeleted as StarDeleted
     from .status import Status as Status
+    from .sub_issues_parent_issue_added import (
+        SubIssuesParentIssueAdded as SubIssuesParentIssueAdded,
+    )
+    from .sub_issues_parent_issue_removed import (
+        SubIssuesParentIssueRemoved as SubIssuesParentIssueRemoved,
+    )
+    from .sub_issues_sub_issue_added import (
+        SubIssuesSubIssueAdded as SubIssuesSubIssueAdded,
+    )
+    from .sub_issues_sub_issue_removed import (
+        SubIssuesSubIssueRemoved as SubIssuesSubIssueRemoved,
+    )
     from .team_add import TeamAdd as TeamAdd
     from .team_added_to_repository import TeamAddedToRepository as TeamAddedToRepository
     from .team_created import TeamCreated as TeamCreated
@@ -603,6 +624,9 @@
         ".projects_v2_item_edited": ("ProjectsV2ItemEdited",),
         ".projects_v2_item_reordered": ("ProjectsV2ItemReordered",),
         ".projects_v2_item_restored": ("ProjectsV2ItemRestored",),
+        ".projects_v2_status_update_created": ("ProjectsV2StatusUpdateCreated",),
+        ".projects_v2_status_update_deleted": ("ProjectsV2StatusUpdateDeleted",),
+        ".projects_v2_status_update_edited": ("ProjectsV2StatusUpdateEdited",),
         ".public": ("Public",),
         ".pull_request_assigned": ("PullRequestAssigned",),
         ".pull_request_auto_merge_disabled": ("PullRequestAutoMergeDisabled",),
@@ -674,9 +698,11 @@
             "RepositoryVulnerabilityAlertResolve",
         ),
         ".secret_scanning_alert_created": ("SecretScanningAlertCreated",),
+        ".secret_scanning_alert_publicly_leaked": (
+            "SecretScanningAlertPubliclyLeaked",
+        ),
         ".secret_scanning_alert_reopened": ("SecretScanningAlertReopened",),
         ".secret_scanning_alert_resolved": ("SecretScanningAlertResolved",),
-        ".secret_scanning_alert_revoked": ("SecretScanningAlertRevoked",),
         ".secret_scanning_alert_validated": ("SecretScanningAlertValidated",),
         ".secret_scanning_alert_location": ("SecretScanningAlertLocationCreated",),
         ".security_advisory_published": ("SecurityAdvisoryPublished",),
@@ -692,6 +718,10 @@
         ".star_created": ("StarCreated",),
         ".star_deleted": ("StarDeleted",),
         ".status": ("Status",),
+        ".sub_issues_parent_issue_added": ("SubIssuesParentIssueAdded",),
+        ".sub_issues_parent_issue_removed": ("SubIssuesParentIssueRemoved",),
+        ".sub_issues_sub_issue_added": ("SubIssuesSubIssueAdded",),
+        ".sub_issues_sub_issue_removed": ("SubIssuesSubIssueRemoved",),
         ".team_add": ("TeamAdd",),
         ".team_added_to_repository": ("TeamAddedToRepository",),
         ".team_created": ("TeamCreated",),

nonebot/adapters/github/event/_base.py

@@ -1,11 +1,12 @@
 from typing import Any
 from typing_extensions import override
 
-from github.message import Message
-from github.utils import get_attr_or_item
 from nonebot.adapters import Event as BaseEvent
 from nonebot.utils import escape_tag
 
+from ..message import Message
+from ..utils import get_attr_or_item
+
 
 class Event(BaseEvent):
     id: str

nonebot/adapters/github/event/_types.py

@@ -209,6 +209,11 @@
         "reordered": "ProjectsV2ItemReordered",
         "restored": "ProjectsV2ItemRestored",
     },
+    "projects_v2_status_update": {
+        "created": "ProjectsV2StatusUpdateCreated",
+        "deleted": "ProjectsV2StatusUpdateDeleted",
+        "edited": "ProjectsV2StatusUpdateEdited",
+    },
     "public": "Public",
     "pull_request": {
         "assigned": "PullRequestAssigned",
@@ -291,9 +296,9 @@
     },
     "secret_scanning_alert": {
         "created": "SecretScanningAlertCreated",
+        "publicly_leaked": "SecretScanningAlertPubliclyLeaked",
         "reopened": "SecretScanningAlertReopened",
         "resolved": "SecretScanningAlertResolved",
-        "revoked": "SecretScanningAlertRevoked",
         "validated": "SecretScanningAlertValidated",
     },
     "secret_scanning_alert_location": "SecretScanningAlertLocationCreated",
@@ -316,6 +321,12 @@
         "deleted": "StarDeleted",
     },
     "status": "Status",
+    "sub_issues": {
+        "parent_issue_added": "SubIssuesParentIssueAdded",
+        "parent_issue_removed": "SubIssuesParentIssueRemoved",
+        "sub_issue_added": "SubIssuesSubIssueAdded",
+        "sub_issue_removed": "SubIssuesSubIssueRemoved",
+    },
     "team_add": "TeamAdd",
     "team": {
         "added_to_repository": "TeamAddedToRepository",

nonebot/adapters/github/event/commit_comment.py

@@ -3,9 +3,9 @@
 
 from githubkit.versions.latest.models import WebhookCommitCommentCreated
 
-from github.message import Message
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
+from ..message import Message
 from ._base import Event
 
 

nonebot/adapters/github/event/issue_comment_created.py

@@ -3,9 +3,9 @@
 
 from githubkit.versions.latest.models import WebhookIssueCommentCreated
 
-from github.message import Message
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
+from ..message import Message
 from ._base import Event
 
 

nonebot/adapters/github/event/issue_comment_deleted.py

@@ -3,9 +3,9 @@
 
 from githubkit.versions.latest.models import WebhookIssueCommentDeleted
 
-from github.message import Message
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
+from ..message import Message
 from ._base import Event
 
 

nonebot/adapters/github/event/issue_comment_edited.py

@@ -3,9 +3,9 @@
 
 from githubkit.versions.latest.models import WebhookIssueCommentEdited
 
-from github.message import Message
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
+from ..message import Message
 from ._base import Event
 
 

nonebot/adapters/github/event/projects_v2_status_update_created.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookProjectsV2StatusUpdateCreated
+
+from ._base import Event
+
+
+class ProjectsV2StatusUpdateCreated(Event):
+    payload: WebhookProjectsV2StatusUpdateCreated

nonebot/adapters/github/event/projects_v2_status_update_deleted.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookProjectsV2StatusUpdateDeleted
+
+from ._base import Event
+
+
+class ProjectsV2StatusUpdateDeleted(Event):
+    payload: WebhookProjectsV2StatusUpdateDeleted

nonebot/adapters/github/event/projects_v2_status_update_edited.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookProjectsV2StatusUpdateEdited
+
+from ._base import Event
+
+
+class ProjectsV2StatusUpdateEdited(Event):
+    payload: WebhookProjectsV2StatusUpdateEdited

nonebot/adapters/github/event/pull_request_review_comment_created.py

@@ -3,9 +3,9 @@
 
 from githubkit.versions.latest.models import WebhookPullRequestReviewCommentCreated
 
-from github.message import Message
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
+from ..message import Message
 from ._base import Event
 
 

nonebot/adapters/github/event/pull_request_review_comment_deleted.py

@@ -3,9 +3,9 @@
 
 from githubkit.versions.latest.models import WebhookPullRequestReviewCommentDeleted
 
-from github.message import Message
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
+from ..message import Message
 from ._base import Event
 
 

nonebot/adapters/github/event/pull_request_review_comment_edited.py

@@ -3,9 +3,9 @@
 
 from githubkit.versions.latest.models import WebhookPullRequestReviewCommentEdited
 
-from github.message import Message
 from nonebot.compat import PYDANTIC_V2, ConfigDict
 
+from ..message import Message
 from ._base import Event
 
 

nonebot/adapters/github/event/secret_scanning_alert_publicly_leaked.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookSecretScanningAlertPubliclyLeaked
+
+from ._base import Event
+
+
+class SecretScanningAlertPubliclyLeaked(Event):
+    payload: WebhookSecretScanningAlertPubliclyLeaked

nonebot/adapters/github/event/sub_issues_parent_issue_added.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookSubIssuesParentIssueAdded
+
+from ._base import Event
+
+
+class SubIssuesParentIssueAdded(Event):
+    payload: WebhookSubIssuesParentIssueAdded

nonebot/adapters/github/event/sub_issues_parent_issue_removed.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookSubIssuesParentIssueRemoved
+
+from ._base import Event
+
+
+class SubIssuesParentIssueRemoved(Event):
+    payload: WebhookSubIssuesParentIssueRemoved

nonebot/adapters/github/event/sub_issues_sub_issue_added.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookSubIssuesSubIssueAdded
+
+from ._base import Event
+
+
+class SubIssuesSubIssueAdded(Event):
+    payload: WebhookSubIssuesSubIssueAdded

nonebot/adapters/github/event/sub_issues_sub_issue_removed.py

@@ -0,0 +1,7 @@
+from githubkit.versions.latest.models import WebhookSubIssuesSubIssueRemoved
+
+from ._base import Event
+
+
+class SubIssuesSubIssueRemoved(Event):
+    payload: WebhookSubIssuesSubIssueRemoved

pyproject.toml

@@ -22,7 +22,7 @@ packages = [{ include = "nonebot" }]
 python = "^3.9"
 nonebot2 = "^2.2.0"
 pydantic = ">=1.10.0,<3.0.0,!=2.5.0,!=2.5.1"
-githubkit = { version = ">=0.11.0,<0.12.0", extras = ["auth-app"] }
+githubkit = { version = ">=0.12.0,<0.13.0", extras = ["auth-app"] }
 
 [tool.poetry.group.dev.dependencies]
 ruff = "^0.8.2"
@@ -60,6 +60,7 @@ ignore = [
   "RUF001", # ambiguous-unicode-character-string
   "RUF002", # ambiguous-unicode-character-docstring
   "RUF003", # ambiguous-unicode-character-comment
+  "TID252", # pyright reports this as an error
 ]
 
 [tool.ruff.lint.extend-per-file-ignores]
@@ -89,6 +90,7 @@ defineConstant = { PYDANTIC_V2 = true }
 
 typeCheckingMode = "standard"
 reportShadowedImports = false
+reportIncompatibleVariableOverride = false
 disableBytesTypePromotions = true
 
 [build-system]