[spark] branch master updated: [SPARK-44129][INFRA] Use "3.5.0" for "master" branch until creating `branch-3.5`

[gu...@apache.org]

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 6cc63cbccfc [SPARK-44129][INFRA] Use "3.5.0" for "master" branch until creating `branch-3.5`
6cc63cbccfc is described below

commit 6cc63cbccfca67d13b2e4166382ccd4f2bd49681
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Wed Jun 21 10:47:04 2023 +0900

    [SPARK-44129][INFRA] Use "3.5.0" for "master" branch until creating `branch-3.5`
    
    ### What changes were proposed in this pull request?
    
    This PR aims to use a hard-coded "3.5.0" temporarily for "master" branch because we have "4.0.0" in Jira system and we cannot bump `master` version until we create `branch-3.5`.
    
    ### Why are the changes needed?
    
    To avoid setting 4.0.0 as 'Fixed Version' mistakenly.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Manual.
    
    Closes #41682 from dongjoon-hyun/SPARK-44129.
    
    Authored-by: Dongjoon Hyun <do...@apache.org>
    Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
 dev/merge_spark_pr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 1621432c01c..c3d524d5433 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -240,7 +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":
-        return versions[0]
+        return "3.5.0" # TODO(SPARK-44130) Revert SPARK-44129 after creating branch-3.5
     else:
         branch_ver = branch.replace("branch-", "")
         return list(filter(lambda x: x.name.startswith(branch_ver), versions))[-1]


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org