Skip to content

[SPARK-56710][INFRA][FOLLOW-UP] Remove duplicates in fixed version in merge script #55665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HyukjinKwon wants to merge 1 commit into from
Closed

[SPARK-56710][INFRA][FOLLOW-UP] Remove duplicates in fixed version in merge script #55665

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions dev/merge_spark_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,17 @@ def _sort_version_names_lex_desc(names):


def _dedupe_fix_versions_adjacent_major_zero(default_fix_versions):
"""Drop V when V is M.minor.0 and predecessor (minor-1).0.0 exists in the list.
"""Preserve order; drop duplicate names, then drop V when V is M.minor.0 and
predecessor (minor-1).0.0 exists in the list.

>>> _dedupe_fix_versions_adjacent_major_zero(["6.0.0", "4.3.0", "4.3.0"])
['6.0.0', '4.3.0']
>>> _dedupe_fix_versions_adjacent_major_zero(["2.0.0", "1.1.0", "1.0.0"])
['2.0.0', '1.0.0']
>>> _dedupe_fix_versions_adjacent_major_zero(["1.0.0", "2.0.0"])
['1.0.0', '2.0.0']
"""
out = list(default_fix_versions)
out = list(dict.fromkeys(default_fix_versions))
for v in list(out):
major, minor, patch = v.split(".")
if patch == "0":
Expand Down Expand Up @@ -230,6 +233,11 @@ def compute_merge_default_fix_versions(merge_branches, unreleased_version_names)
... ["master", "branch-5.x", "branch-4.x"], ["5.2.0", "4.3.0", "6.0.0"]
... )[0]
['6.0.0', '5.2.0', '4.3.0']

>>> compute_merge_default_fix_versions(
... ["master", "branch-4.x", "branch-4.x"], ["6.0.0", "4.3.0"]
... )[0]
['6.0.0', '4.3.0']
"""
names = _sort_version_names_lex_desc(list(unreleased_version_names))
merged_set = set(merge_branches)
Expand Down