This is an automated email from the ASF dual-hosted git repository.
HyukjinKwon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark-connect-rust.git
The following commit(s) were added to refs/heads/master by this push:
new ce12816 [SPARK-59034][INFRA] Use connect-rust-* fix versions in
merge_connect_rust_pr.py
ce12816 is described below
commit ce12816db6c48d35bd13e60d1e8f3d3c4336b0ea
Author: Hyukjin Kwon <[email protected]>
AuthorDate: Thu Aug 27 10:04:12 2026 +0900
[SPARK-59034][INFRA] Use connect-rust-* fix versions in
merge_connect_rust_pr.py
### What changes were proposed in this pull request?
`resolve_jira_issue` in `dev/merge_connect_rust_pr.py` filtered the SPARK
project versions to plain `x.y.z` names (`re.match(r"\d+\.\d+\.\d+", ...)`),
which matches only the core Spark versions (4.2.0, 5.0.0, ...) and skips the
`connect-rust-*` line. This changes the filter to match
`connect-rust-\d+\.\d+\.\d+` versions instead.
### Why are the changes needed?
spark-connect-rust ships on its own `connect-rust-*` version line. With the
old filter, the merge tool offered and set core Spark fix versions on
spark-connect-rust JIRAs, which then leaked into the **core Spark** release
notes. Matching the `connect-rust-*` versions keeps these JIRAs in the
connect-rust release notes where they belong.
### Does this PR introduce _any_ user-facing change?
No. Committer-side merge tooling only.
### How was this patch tested?
`python3 -m py_compile dev/merge_connect_rust_pr.py`. The regex was
verified against the current SPARK project versions: it now selects
`connect-rust-0.1.0` and excludes the core `x.y.z` versions.
This pull request and its description were written by Isaac.
Closes #60 from
HyukjinKwon/gurwls223/fix-merge-script-connect-rust-fixversion.
Authored-by: Hyukjin Kwon <[email protected]>
Signed-off-by: Hyukjin Kwon <[email protected]>
---
dev/merge_connect_rust_pr.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/dev/merge_connect_rust_pr.py b/dev/merge_connect_rust_pr.py
index 38b3fdd..fd18661 100755
--- a/dev/merge_connect_rust_pr.py
+++ b/dev/merge_connect_rust_pr.py
@@ -307,11 +307,16 @@ def resolve_jira_issue(merge_branches, comment,
default_jira_id=""):
choose_jira_assignee(issue)
versions = asf_jira.project_versions("SPARK")
- # Consider only x.y.z, unreleased, unarchived versions
+ # Consider only connect-rust-x.y.z, unreleased, unarchived versions.
spark-connect-rust
+ # ships on its own `connect-rust-*` version line rather than the core
Spark x.y.z versions,
+ # so that its JIRAs are tracked in the connect-rust release notes instead
of leaking into
+ # the core Spark release notes.
versions = [
x
for x in versions
- if not x.raw["released"] and not x.raw["archived"] and
re.match(r"\d+\.\d+\.\d+", x.name)
+ if not x.raw["released"]
+ and not x.raw["archived"]
+ and re.match(r"connect-rust-\d+\.\d+\.\d+", x.name)
]
versions = sorted(versions, key=lambda x: x.name, reverse=True)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
