Upgrade to pygithub 2.8

This commit syncs Meta internal changes.

The only significant change is migration from pygithub from 1.59 to
2.8, which changed the authentication API.

Other changes are formatting applied automatically by bots.

Signed-off-by: Ihor Solodrai <[email protected]>

Author: theihor

kernel_patches_daemon/__main__.py

@@ -19,7 +19,6 @@
 from github.Repository import Repository
 from kernel_patches_daemon.config import KPDConfig
 from kernel_patches_daemon.daemon import KernelPatchesDaemon
-
 from opentelemetry import metrics
 from opentelemetry.sdk.metrics import MeterProvider
 from opentelemetry.sdk.metrics.export import (

kernel_patches_daemon/branch_worker.py

@@ -48,7 +48,6 @@
 from github.PullRequest import PullRequest
 from github.Repository import Repository
 from github.WorkflowJob import WorkflowJob
-
 from kernel_patches_daemon.config import (
     EmailConfig,
     PRCommentsForwardingConfig,
@@ -782,7 +781,7 @@ def update_e2e_test_branch_and_update_pr(
 
     def can_do_sync(self) -> bool:
         github_ratelimit = self.git.get_rate_limit()
-        if github_ratelimit.core.remaining < MIN_REMAINING_GITHUB_TOKENS:
+        if github_ratelimit.resources.core.remaining < MIN_REMAINING_GITHUB_TOKENS:
             return False
         return True
 

kernel_patches_daemon/config.py

@@ -7,7 +7,6 @@
 # pyre-unsafe
 
 import json
-
 import logging
 import os
 import re

kernel_patches_daemon/github_connector.py

@@ -37,9 +37,9 @@
 TOKEN_REFRESH_THRESHOLD_TIMEDELTA = timedelta(
     seconds=ACCESS_TOKEN_REFRESH_THRESHOLD_SECONDS
 )
-assert hasattr(
-    Auth, "TOKEN_REFRESH_THRESHOLD_TIMEDELTA"
-), "Could not monkey patch TOKEN_REFRESH_THRESHOLD_TIMEDELTA, it may have changed upstream."
+assert hasattr(Auth, "TOKEN_REFRESH_THRESHOLD_TIMEDELTA"), (
+    "Could not monkey patch TOKEN_REFRESH_THRESHOLD_TIMEDELTA, it may have changed upstream."
+)
 Auth.TOKEN_REFRESH_THRESHOLD_TIMEDELTA = TOKEN_REFRESH_THRESHOLD_TIMEDELTA
 
 BOT_USER_LOGIN_SUFFIX = "[bot]"
@@ -65,9 +65,9 @@ def __init__(
         app_auth: Optional[Auth.AppInstallationAuth] = None,
         http_retries: Optional[int] = None,
     ) -> None:
-        assert bool(github_oauth_token) ^ bool(
-            app_auth
-        ), "Only one of github_oauth_token or app_auth can be set"
+        assert bool(github_oauth_token) ^ bool(app_auth), (
+            "Only one of github_oauth_token or app_auth can be set"
+        )
         self.repo_name: str = os.path.basename(repo_url)
         self.base_repo_url: str = repo_url
         self.auth_type = AuthType.UNKNOWN
@@ -89,12 +89,9 @@ def __init__(
             self.github_account_name = gh_user.login
         else:
             self.auth_type = AuthType.APP_AUTH
+            # In PyGithub 2.x, AppInstallationAuth stores the AppAuth object in _app_auth
             # pyrefly: ignore  # missing-attribute
-            app = GithubIntegration(
-                auth=Auth.AppAuth(
-                    app_id=app_auth.app_id, private_key=app_auth.private_key
-                )
-            ).get_app()
+            app = GithubIntegration(auth=app_auth._app_auth).get_app()
             self.github_account_name = app.name
             # Github appends '[bot]' suffix to the NamedUser
             # >>> pull.user
@@ -138,9 +135,9 @@ def __init__(
             self.user_or_org = org
             self.repo = self.git.get_organization(org).get_repo(self.repo_name)
 
-        assert (
-            self.auth_type != AuthType.UNKNOWN
-        ), "Auth type is still set to unknown... something is wrong."
+        assert self.auth_type != AuthType.UNKNOWN, (
+            "Auth type is still set to unknown... something is wrong."
+        )
 
     def __get_new_auth_token(self) -> str:
         # refresh token if needed

kernel_patches_daemon/github_logs.py

@@ -15,7 +15,6 @@
 
 import aiohttp
 from github.WorkflowJob import WorkflowJob
-
 from kernel_patches_daemon.status import gh_conclusion_to_status, Status
 
 logger: logging.Logger = logging.getLogger(__name__)

kernel_patches_daemon/github_sync.py

@@ -28,7 +28,6 @@
     DefaultGithubLogExtractor,
     GithubLogExtractor,
 )
-
 from kernel_patches_daemon.patchwork import Patchwork, Series, Subject
 from kernel_patches_daemon.stats import HistogramMetricTimer, Stats
 from opentelemetry import metrics
@@ -387,7 +386,7 @@ async def sync_patches(self) -> None:
 
             rate_limit = worker.git.get_rate_limit()
             github_ratelimit_remaining.record(
-                rate_limit.core.remaining,
+                rate_limit.resources.core.remaining,
                 {"user": worker.github_account_name},
             )
 

kernel_patches_daemon/patchwork.py

@@ -18,15 +18,12 @@
 
 import aiohttp
 import cachetools.keys
-
 import dateutil.parser as dateparser
 from aiohttp_retry import ExponentialRetry, RetryClient
 from cachetools import TTLCache
-
 from kernel_patches_daemon.config import SERIES_ID_SEPARATOR
 from kernel_patches_daemon.status import Status
 from multidict import MultiDict
-
 from opentelemetry import metrics
 from pyre_extensions import none_throws
 

pyproject.toml

@@ -16,7 +16,6 @@ classifiers = [
     "Typing :: Typed",
     "Topic :: Utilities",
 ]
-
 [tool.poetry.dependencies]
 aiohttp = "^3.8"
 aiohttp-retry = "^2.8"
@@ -26,7 +25,7 @@ python = "^3.10"
 cachetools = "^5.3.0"
 gitpython = "^3.1"
 opentelemetry-api = "^1.18.0"
-pygithub = "^1.59.0"
+pygithub = "^2.8.1"
 pyre-extensions = "^0.0.30"
 opentelemetry-sdk = "^1.18.0"
 python-dateutil = "^2.8.2"

tests/common/patchwork_mock.py

@@ -7,11 +7,9 @@
 # pyre-unsafe
 
 import re
-
 from typing import Any, Dict, Final
 
 from aioresponses import aioresponses
-
 from kernel_patches_daemon.patchwork import (
     IRRELEVANT_STATES,
     Patchwork,

tests/test_branch_worker.py

@@ -22,9 +22,7 @@
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import git
-
 from aioresponses import aioresponses
-
 from freezegun import freeze_time
 from git.exc import GitCommandError
 from kernel_patches_daemon.branch_worker import (
@@ -58,14 +56,12 @@
 from kernel_patches_daemon.patchwork import Series, Subject
 from kernel_patches_daemon.status import Status
 from munch import Munch, munchify
-
 from tests.common.patchwork_mock import (
     DEFAULT_TEST_RESPONSES,
     get_default_pw_client,
     init_pw_responses,
     PatchworkMock,
 )
-
 from tests.common.utils import load_test_data, read_fixture, read_test_data_file
 
 
@@ -1097,7 +1093,7 @@ def setUp(self):
         self.repo.create_head("two_commit_change", commit="master").checkout()
         for i in range(2):
             with open(f"{self.tmp_dir}/file.txt", "a") as f:
-                f.write(f"line {i+1}\n")
+                f.write(f"line {i + 1}\n")
             self.repo.index.add(["file.txt"])
             self.repo.index.commit("split change, part {i+1}\n")
 
@@ -1107,7 +1103,7 @@ def setUp(self):
         ).checkout()
         for i in range(2):
             with open(f"{self.tmp_dir}/file.txt", "a") as f:
-                f.write(f"line {i+1}\n")
+                f.write(f"line {i + 1}\n")
             self.repo.index.add(["file.txt"])
             self.repo.index.commit(self.SINGLE_COMMIT_CHANGE_MESSAGE)