griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tools: Adress mypy errors in recent weekly report script additions

Browse Source 
5a5e1b7d14 added caused some errors when running `make check_mypy`, see
https://projects.blender.org/blender/blender/pulls/138615#issuecomment-1581404.
This commit is contained in:
Julian Eisel
2025-05-22 12:29:02 +02:00
parent 57d9c2c098
commit ca4b485413
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/triage/gitea_utils.py
View File

@@ -108,7 +108,7 @@ def gitea_json_activities_get(username: str, date: str) -> list[dict[str, Any]]:
return result
def gitea_json_pull_request_by_base_and_head_get(repo_name: str, base: str, head: str) -> dict[str, Any]:
def gitea_json_pull_request_by_base_and_head_get(repo_name: str, base: str, head: str) -> dict[str, Any] | None:
"""
Get a pull request by base and head
:param repo_name: Full name of the repository, e.g. "blender/blender".
@@ -117,6 +117,7 @@ def gitea_json_pull_request_by_base_and_head_get(repo_name: str, base: str, head
"""
url = f"{BASE_API_URL}/repos/{repo_name}/pulls/{base}/{head}"
result = url_json_get(url, quiet=True)
assert isinstance(result, dict)
return result

10
tools/triage/weekly_report.py
View File

@@ -146,7 +146,7 @@ def report_personal_weekly_get(
@dataclass
class PullRequest:
descriptor: str
title_str: str
@dataclass
class Repository:
@@ -154,7 +154,7 @@ def report_personal_weekly_get(
# Branches targeting this repository. Branch name is key.
branches: dict[str, Branch] = field(default_factory=dict)
# Pull requests targeting this repository. Key is repository of the branch and the branch name.
prs: dict[str, PullRequest] = field(default_factory=dict)
prs: dict[tuple[str, str], PullRequest] = field(default_factory=dict)
# Repositories containing any commit activity, identified by full name (e.g. "blender/blender").
repositories: dict[str, Repository] = {}
@@ -250,7 +250,7 @@ def report_personal_weekly_get(
pr_title = pr["title"]
pr_id = pr["number"]
target_repo.prs[(repo_fullname, branch_name)
] = f"{pr_title} ({target_repo_fullname}!{pr_id})"
] = PullRequest(f"{pr_title} ({target_repo_fullname}!{pr_id})")
branch.commits.append(f"{title} ({repo_fullname}@{hash_value})")
@@ -360,7 +360,7 @@ def report_personal_weekly_get(
"blender/blender-manual": "Blender Manual",
}
def print_repo(repo: Repository, indent_level=0):
def print_repo(repo: Repository, indent_level: int = 0) -> None:
# Print main branch commits immediately, no need to add extra section.
main_branch = repo.branches.get("main")
if main_branch:
@@ -374,7 +374,7 @@ def report_personal_weekly_get(
pr = repo.prs.get((branch.repository_full_name, branch_name))
if pr:
print("{:s}* {:s}".format(" " * indent_level, pr))
print("{:s}* {:s}".format(" " * indent_level, pr.title_str))
else:
print("{:s}* {:s}:{:s}".format(" " * indent_level, branch.repository_full_name, branch_name))