Skip to content

Commit 1ff7da6

Browse files
committed
ICU-23170 commit-checker first cut at fix
1 parent e862a5f commit 1ff7da6

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

tools/commit-checker/Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ python_version = "3"
1212

1313
[packages]
1414
gitpython = "*"
15-
jira = "3.5.0"
15+
jira = "3.10.5"
1616

1717
[dev-packages]
1818
pytest = "*"

tools/commit-checker/check.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,20 +335,21 @@ def get_jira_issues(jira_query, **kwargs):
335335
Yields an ICUIssue for each issue in the user-specified query.
336336
"""
337337
jira_url, jira = get_jira_instance(**kwargs)
338-
# Jira limits us to query the API using a limited batch size.
339-
start = 0
340-
batch_size = 100 # https://jira.atlassian.com/browse/JRACLOUD-67570
338+
nextPageToken=None
339+
start=0
341340
while True:
342-
issues = jira.search_issues(jira_query, startAt=start, maxResults=batch_size)
341+
issues = jira.enhanced_search_issues(jira_query, nextPageToken=nextPageToken, maxResults=False)
343342
if len(issues) > 0:
344343
print("Loaded issues %d-%d\t of %d" % (start + 1, start + len(issues), issues.total), file=sys.stderr)
345344
else:
346345
print(":warning: No issues matched the query.") # leave this as a warning
347346
for jira_issue in issues:
348347
yield make_icu_issue(jira_issue)
349-
if len(issues) < batch_size:
348+
if "nextPageToken" in issues:
349+
nextPageToken = issues["nextPageToken"]
350+
else:
350351
break
351-
start += batch_size
352+
start += len(issues)
352353

353354
jira_issue_map = dict() # loaded in main()
354355
commit_metadata = None

0 commit comments

Comments
 (0)