Skip to content

Commit 1828356

Browse files
[Github] Fully remove use of login_or_token (llvm#179258)
PyGithub deprecated this a while back. An earlier patch attempted to fix all the deprecations, but it looks like my grep expression missed a bunch of cases. This patch should catch the remaining ones (minus libc++ which have been split for review by libc++ maintainers).
1 parent fba111d commit 1828356

6 files changed

Lines changed: 26 additions & 16 deletions

File tree

.ci/premerge_advisor_explain.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ def get_comment(
3333
pr_number: int,
3434
body: str,
3535
) -> dict[str, str]:
36-
repo = github.Github(github_token).get_repo("llvm/llvm-project")
36+
repo = github.Github(auth=github.Auth.Token(github_token)).get_repo(
37+
"llvm/llvm-project"
38+
)
3739
pr = repo.get_issue(pr_number).as_pull_request()
3840
body = COMMENT_TAG.format(platform=platform.system()) + "\n" + body
3941
comment = {"body": body}

.github/workflows/commit-create-issue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import sys
33

44
token = sys.argv[1]
5-
gh = github.Github(login_or_token=token)
5+
gh = github.Github(auth=github.Auth.Token(token))
66
repo = gh.get_repo("llvm/llvm-project")
77

88
length = "4 weeks"

llvm/utils/git/code-format-helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def update_pr(self, comment_text: str, args: FormatArgs, create_new: bool) -> No
124124
import github
125125
from github import IssueComment, PullRequest
126126

127-
repo = github.Github(args.token).get_repo(args.repo)
127+
repo = github.Github(auth=github.Auth.Token(args.token)).get_repo(args.repo)
128128
pr = repo.get_issue(args.issue_number).as_pull_request()
129129

130130
comment_text = self.comment_tag + "\n\n" + comment_text

llvm/utils/git/code-lint-helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def find_comment(self, pr: Any) -> Any:
111111

112112
def update_pr(self, comment_text: str, args: LintArgs, create_new: bool) -> None:
113113
assert args.repo is not None
114-
repo = github.Github(args.token).get_repo(args.repo)
114+
repo = github.Github(auth=github.Auth.Token(args.token)).get_repo(args.repo)
115115
pr = repo.get_issue(args.issue_number).as_pull_request()
116116

117117
comment_text = f"{self.comment_tag}\n\n{comment_text}"

llvm/utils/git/github-automation.py

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ def team_name(self) -> str:
6666
return self._team_name
6767

6868
def __init__(self, token: str, repo: str, issue_number: int, label_name: str):
69-
self.repo = github.Github(token).get_repo(repo)
70-
self.org = github.Github(token).get_organization(self.repo.organization.login)
69+
self.repo = github.Github(auth=github.Auth.Token(token)).get_repo(repo)
70+
self.org = github.Github(auth=github.Auth.Token(token)).get_organization(
71+
self.repo.organization.login
72+
)
7173
self.issue = self.repo.get_issue(issue_number)
7274
self._team_name = "issue-subscribers-{}".format(label_name).lower()
7375

@@ -111,8 +113,10 @@ def team_name(self) -> str:
111113
return self._team_name
112114

113115
def __init__(self, token: str, repo: str, pr_number: int, label_name: str):
114-
self.repo = github.Github(token).get_repo(repo)
115-
self.org = github.Github(token).get_organization(self.repo.organization.login)
116+
self.repo = github.Github(auth=github.Auth.Token(token)).get_repo(repo)
117+
self.org = github.Github(auth=github.Auth.Token(token)).get_organization(
118+
self.repo.organization.login
119+
)
116120
self.pr = self.repo.get_issue(pr_number).as_pull_request()
117121
self._team_name = "pr-subscribers-{}".format(
118122
label_name.replace("+", "x")
@@ -230,7 +234,7 @@ class PRGreeter:
230234
COMMENT_TAG = "<!--LLVM NEW CONTRIBUTOR COMMENT-->\n"
231235

232236
def __init__(self, token: str, repo: str, pr_number: int):
233-
repo = github.Github(token).get_repo(repo)
237+
repo = github.Github(auth=github.Auth.Token(token)).get_repo(repo)
234238
self.pr = repo.get_issue(pr_number).as_pull_request()
235239

236240
def run(self) -> bool:
@@ -260,7 +264,7 @@ def run(self) -> bool:
260264

261265
class CommitRequestGreeter:
262266
def __init__(self, token: str, repo: str, issue_number: int):
263-
self.repo = github.Github(token).get_repo(repo)
267+
self.repo = github.Github(auth=github.Auth.Token(token)).get_repo(repo)
264268
self.issue = self.repo.get_issue(issue_number)
265269

266270
def run(self) -> bool:
@@ -323,7 +327,7 @@ class PRBuildbotInformation:
323327
COMMENT_TAG = "<!--LLVM BUILDBOT INFORMATION COMMENT-->\n"
324328

325329
def __init__(self, token: str, repo: str, pr_number: int, author: str):
326-
repo = github.Github(token).get_repo(repo)
330+
repo = github.Github(auth=github.Auth.Token(token)).get_repo(repo)
327331
self.pr = repo.get_issue(pr_number).as_pull_request()
328332
self.author = author
329333

@@ -460,7 +464,9 @@ def requested_by(self) -> str:
460464

461465
@property
462466
def repo(self) -> github.Repository.Repository:
463-
return github.Github(self.token).get_repo(self.repo_name)
467+
return github.Github(auth=github.Auth.Token(self.token)).get_repo(
468+
self.repo_name
469+
)
464470

465471
@property
466472
def issue(self) -> github.Issue.Issue:
@@ -725,7 +731,9 @@ def create_pull_request(
725731
https://docs.github.com/en/get-started/quickstart/github-glossary#base-branch
726732
https://docs.github.com/en/get-started/quickstart/github-glossary#compare-branch
727733
"""
728-
repo = github.Github(self.token).get_repo(self.repo_name)
734+
repo = github.Github(auth=github.Auth.Token(self.token)).get_repo(
735+
self.repo_name
736+
)
729737
issue_ref = "{}#{}".format(self.repo_name, self.issue_number)
730738
pull = None
731739
release_branch_for_issue = self.release_branch_for_issue
@@ -800,7 +808,7 @@ def execute_command(self) -> bool:
800808

801809

802810
def request_release_note(token: str, repo_name: str, pr_number: int):
803-
repo = github.Github(token).get_repo(repo_name)
811+
repo = github.Github(auth=github.Auth.Token(token)).get_repo(repo_name)
804812
pr = repo.get_issue(pr_number).as_pull_request()
805813
submitter = pr.user.login
806814
if submitter == "llvmbot":

llvm/utils/release/github-upload-release.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def uncomment_download_links(repo, release_version):
280280

281281
args = parser.parse_args()
282282

283-
gh = github.Github(args.token)
283+
gh = github.Github(auth=github.Auth.Token(args.token))
284284
llvm_org = gh.get_organization("llvm")
285285
llvm_repo = llvm_org.get_repo("llvm-project")
286286

@@ -291,7 +291,7 @@ def uncomment_download_links(repo, release_version):
291291
# Validate that this user is allowed to modify releases.
292292
user = gh.get_user(args.user)
293293
team = (
294-
github.Github(args.user_token)
294+
github.Github(auth=github.Auth.Token(args.user_token))
295295
.get_organization("llvm")
296296
.get_team_by_slug("llvm-release-managers")
297297
)

0 commit comments

Comments
 (0)