Skip to content

Commit bc57789

Browse files
committed
SPARK-5776 JIRA version not of form x.y.z breaks merge_spark_pr.py
Consider only x.y.z verisons from JIRA. CC JoshRosen who will probably know this script well. Alternative is to call the version "2.0.0" after all in JIRA. Author: Sean Owen <[email protected]> Closes #4570 from srowen/SPARK-5776 and squashes the following commits: fffafde [Sean Owen] Consider only x.y.z verisons from JIRA
1 parent 99bd500 commit bc57789

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

dev/merge_spark_pr.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
244244
versions = asf_jira.project_versions("SPARK")
245245
versions = sorted(versions, key=lambda x: x.name, reverse=True)
246246
versions = filter(lambda x: x.raw['released'] is False, versions)
247+
# Consider only x.y.z versions
248+
versions = filter(lambda x: re.match('\d+\.\d+\.\d+', x.name), versions)
247249

248250
default_fix_versions = map(lambda x: fix_version_from_branch(x, versions).name, merge_branches)
249251
for v in default_fix_versions:

0 commit comments

Comments
 (0)