This is an automated email from the ASF dual-hosted git repository.
zhengruifeng 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 d96ad72efc0d [MINOR][INFRA] Add spacing before JIRA update prompt
d96ad72efc0d is described below
commit d96ad72efc0d51c77b083bd0f80fd3697cbd2c94
Author: Ruifeng Zheng <[email protected]>
AuthorDate: Thu Aug 13 15:45:02 2026 +0800
[MINOR][INFRA] Add spacing before JIRA update prompt
### What changes were proposed in this pull request?
Print a blank line before `merge_spark_pr.py` asks whether to update an
associated JIRA.
### Why are the changes needed?
After a merge summary is posted, the JIRA prompt currently appears
immediately after the
summary attribution:
```
*Posted by `merge_spark_pr.py`*
Would you like to update an associated JIRA? (y/N):
```
The blank line makes the transition to the next interactive step easier to
read.
### Does this PR introduce _any_ user-facing change?
No. This only adjusts output formatting in the Spark committer merge tool.
### How was this patch tested?
The following checks passed:
```
cd dev
conda run -n spark-dev-313 python -m doctest merge_spark_pr.py
```
79 doctests passed.
```
conda run -n spark-dev-313 ruff check --config pyproject.toml
dev/merge_spark_pr.py
conda run -n spark-dev-313 ruff format --check --config pyproject.toml
dev/merge_spark_pr.py
git diff --check
```
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Codex (GPT-5)
Closes #57984 from zhengruifeng/minor-merge-script-jira-prompt-spacing-dev1.
Authored-by: Ruifeng Zheng <[email protected]>
Signed-off-by: Ruifeng Zheng <[email protected]>
---
dev/merge_spark_pr.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 764ccc4a5e30..053aa5d919be 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -1321,6 +1321,7 @@ def resolve_jira_issues(title, merge_branches, comment,
title_components=(), all
def update_jira_for_pr(pr_num, title, merge_branches, title_components,
allow_resolved=False):
# asf_jira is guaranteed to be set here: initialize_jira() fails fast
otherwise.
+ print()
continue_maybe("Would you like to update an associated JIRA?")
jira_comment = "Issue resolved by pull request %s\n[%s/%s]" % (
pr_num,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
