This is an automated email from the ASF dual-hosted git repository. gurwls223 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push: new 88de5663cc8 Revert "[SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr" 88de5663cc8 is described below commit 88de5663cc8d93b1f50dce52e0519005aa1f1c60 Author: Hyukjin Kwon <gurwls...@apache.org> AuthorDate: Fri Aug 11 11:14:12 2023 +0900 Revert "[SPARK-44760][INFRA] Fix list index out of range for JIRA resolution in merge_spark_pr" This reverts commit 3164ff51dd249670b8505a5ea8d361cf53c9db94. --- dev/merge_spark_pr.py | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index 88792e77161..41b00b463f1 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -237,6 +237,15 @@ def cherry_pick(pr_num, merge_hash, default_branch): return pick_ref +def fix_version_from_branch(branch, versions): + # Note: Assumes this is a sorted (newest->oldest) list of un-released versions + if branch == "master": + return versions[0] + else: + branch_ver = branch.replace("branch-", "") + return list(filter(lambda x: x.name.startswith(branch_ver), versions))[-1] + + def resolve_jira_issue(merge_branches, comment, default_jira_id=""): asf_jira = jira.client.JIRA( {"server": JIRA_API_BASE}, basic_auth=(JIRA_USERNAME, JIRA_PASSWORD) @@ -271,30 +280,14 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""): ) versions = asf_jira.project_versions("SPARK") - # Consider only x.y.z, unreleased, unarchived versions - versions = [ - x - for x in versions - if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name) - ] versions = sorted(versions, key=lambda x: x.name, reverse=True) + versions = list(filter(lambda x: x.raw["released"] is False, versions)) + # Consider only x.y.z versions + versions = list(filter(lambda x: re.match(r"\d+\.\d+\.\d+", x.name), versions)) - default_fix_versions = [] - for b in merge_branches: - if b == "master": - default_fix_versions.append(versions[0]) - else: - found = False - for v in versions: - if v.name.startswith(b.replace("branch-", "")): - default_fix_versions.append(v) - found = True - if not found: - print( - "Target version for %s is not found on JIRA, it may be archived or " - "not created. Skipping it." % b - ) - + default_fix_versions = list( + map(lambda x: fix_version_from_branch(x, versions).name, merge_branches) + ) for v in default_fix_versions: # Handles the case where we have forked a release branch but not yet made the release. # In this case, if the PR is committed to the master branch and the release branch, we --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org