This is an automated email from the ASF dual-hosted git repository.
alexott pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new d01a3bc [dev fix] make fix_version unique
d01a3bc is described below
commit d01a3bc3061d2d858a63f14eec696cf712025388
Author: Alex Ott <alex...@apache.org>
AuthorDate: Fri May 1 19:14:51 2020 +0200
[dev fix] make fix_version unique
### What is this PR for?
Right now, if you merge PR into 2 branches, like, `master`, and
`branch-0.9`, script
generates suggestion for "Fix Version" as `0.9.0,0.9.0`, because both
master & 0.9 branch
are using the same base version. This small fix leaves only unique values
for suggested
version(s).
### What type of PR is it?
Development Improvement
Author: Alex Ott <alex...@apache.org>
Closes #3757 from alexott/make-version-list-unique and squashes the
following commits:
53337e8aa [Alex Ott] [dev fix] make fix_version unique
---
dev/merge_zeppelin_pr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/merge_zeppelin_pr.py b/dev/merge_zeppelin_pr.py
index b11a9ef..488b9ba 100755
--- a/dev/merge_zeppelin_pr.py
+++ b/dev/merge_zeppelin_pr.py
@@ -249,7 +249,7 @@ def resolve_jira_issue(merge_branches, comment,
default_jira_id=""):
# Consider only x.y.z versions
versions = filter(lambda x: re.match('\d+\.\d+\.\d+', x.name), versions)
- default_fix_versions = map(lambda x: fix_version_from_branch(x,
versions).name, merge_branches)
+ default_fix_versions = set(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
