Skip to content

GH-33005: [Dev] Update the pull request merge script to work with master or main #14533

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

Merged
raulcd merged 17 commits into from
Jan 12, 2023
Merged

GH-33005: [Dev] Update the pull request merge script to work with master or main #14533

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e23d239
Add function to compute the default branch name from git, use the val…
lafiona Oct 27, 2022
69f64c7
Use python for processing the default branch reference from git.
lafiona Oct 27, 2022
70294b3
Use the git environment in the yml file to get the default branch nam…
lafiona Nov 16, 2022
a1de551
Enable users who are calling the merge script from a git repository c…
lafiona Nov 16, 2022
af9a04a
Run linting
lafiona Nov 16, 2022
292694e
Apply branch renaming changes to refactoring changes in dev/merge_arr…
lafiona Jan 6, 2023
c91010d
Add default value for merge_branches in get_candidate_fix_version
lafiona Jan 6, 2023
51aae04
Added rstrip command to remove newline character after retrieving def…
lafiona Jan 9, 2023
e3582b7
Update dev/merge_arrow_pr.py to not use lstrip()
lafiona Jan 10, 2023
702f8e4
Fix startswith call to use the correct string and remove unused code …
lafiona Jan 11, 2023
f264faa
Modify call site of fix_version_from_branch to return a scalar value.
lafiona Jan 11, 2023
db2beaf
Remove merge_branches in argument list and body of get_candidate_fix_…
lafiona Jan 12, 2023
6eb674c
Remove extra newline.
lafiona Jan 12, 2023
677ad20
Update dev/merge_arrow_pr.py to avoid importing "warnings" module.
lafiona Jan 12, 2023
d829c55
Update dev/merge_arrow_pr.py
lafiona Jan 12, 2023
992eafe
Update .github/workflows/dev.yml
lafiona Jan 12, 2023
f59a539
Update dev/merge_arrow_pr.py
lafiona Jan 12, 2023
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
18 changes: 6 additions & 12 deletions dev/merge_arrow_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,10 @@ def strip_ci_directives(commit_message):
return _REGEX_CI_DIRECTIVE.sub('', commit_message)


def fix_version_from_branch(branch, versions):
def fix_version_from_branch(versions):
# Note: Assumes this is a sorted (newest->oldest) list of un-released
# versions
if branch == "master":
return versions[-1]
else:
branch_ver = branch.replace("branch-", "")
return [v for v in versions if v.startswith(branch_ver)][-1]
return versions[-1]


MIGRATION_COMMENT_REGEX = re.compile(
Expand Down Expand Up @@ -278,8 +274,8 @@ def show(self):


def get_candidate_fix_version(mainline_versions,
merge_branches=('master',),
maintenance_branches=()):

all_versions = [getattr(v, "name", v) for v in mainline_versions]

def version_tuple(x):
Expand All @@ -302,11 +298,9 @@ def version_tuple(x):

mainline_versions = [v for v in mainline_versions
if f"maint-{v}" not in maintenance_branches]
default_fix_versions = [
fix_version_from_branch(x, mainline_versions)
for x in merge_branches]
default_fix_versions = fix_version_from_branch(mainline_versions)

return default_fix_versions[0]
return default_fix_versions


def format_issue_output(issue_type, issue_id, status,
Expand Down Expand Up @@ -644,7 +638,7 @@ def get_primary_author(cmd, distinct_authors):

def prompt_for_fix_version(cmd, issue, maintenance_branches=()):
default_fix_version = get_candidate_fix_version(
issue.current_versions,
mainline_versions=issue.current_versions,
maintenance_branches=maintenance_branches
)

Expand Down