This is an automated email from the ASF dual-hosted git repository.
gurwls223 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 4b10e4b8921 Revert "[SPARK-44129][INFRA] Use "3.5.0" for "master"
branch until creating `branch-3.5`"
4b10e4b8921 is described below
commit 4b10e4b8921a9864fc5cc75d214ef7b4fecb5e3c
Author: Hyukjin Kwon <gurwls...@apache.org>
AuthorDate: Tue Jul 18 08:22:39 2023 +0900
Revert "[SPARK-44129][INFRA] Use "3.5.0" for "master" branch until creating
`branch-3.5`"
This reverts commit 692ec99bc7884cc998afbf63e4ef53053c0c9dd7.
---
dev/merge_spark_pr.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index bc51b8af2eb..41b00b463f1 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -240,8 +240,7 @@ def cherry_pick(pr_num, merge_hash, default_branch):
def fix_version_from_branch(branch, versions):
# Note: Assumes this is a sorted (newest->oldest) list of un-released
versions
if branch == "master":
- # TODO(SPARK-44130) Revert SPARK-44129 after creating branch-3.5
- return [v for v in versions if v.name == "3.5.0"][0]
+ return versions[0]
else:
branch_ver = branch.replace("branch-", "")
return list(filter(lambda x: x.name.startswith(branch_ver),
versions))[-1]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
