Skip to content

Conversation

@HyukjinKwon
Copy link
Member

What changes were proposed in this pull request?

This PR proposes to address type hints __version__: str correctly in each release. The type hint was added from Spark 3.3.0 at f59e1d5.

Why are the changes needed?

For PySpark to have the correct version in releases.

Does this PR introduce any user-facing change?

No, dev-only.

How was this patch tested?

Manually tested by setting environment variables and running the changed shall commands locally.

@HyukjinKwon
Copy link
Member Author

Merged to master.

The tests don't run this code path.

@cloud-fan
Copy link
Contributor

shall we merge to 3.3 as well?

@HyukjinKwon
Copy link
Member Author

We always use master branch to release, no?

@HyukjinKwon
Copy link
Member Author

let me backport just for sure in any event.

HyukjinKwon added a commit that referenced this pull request Jun 8, 2022
…rk/version.py

This PR proposes to address type hints `__version__: str` correctly in each release. The type hint was added from Spark 3.3.0 at f59e1d5.

For PySpark to have the correct version in releases.

No, dev-only.

Manually tested by setting environment variables and running the changed shall commands locally.

Closes #36803 from HyukjinKwon/SPARK-39411.

Authored-by: Hyukjin Kwon <gurwls223@apache.org>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
(cherry picked from commit 87b0a41)
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
@cloud-fan
Copy link
Contributor

We always use master branch to release, no?

No, we use branch-3.3 to release 3.3.x

@HyukjinKwon
Copy link
Member Author

I read e.g., https://lists.apache.org/thread/tcjh5wlthg21j519tl7o25cdo81792vr vs. #25607 (comment)

Using other branches is technically a workaround IIRC, and should probably make the master branch working

Copy link
Member

@dongjoon-hyun dongjoon-hyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, LGTM.
Thank you for patching and backporting to branch-3.3.

@HyukjinKwon HyukjinKwon deleted the SPARK-39411 branch January 15, 2024 00:53
HyukjinKwon pushed a commit that referenced this pull request Mar 26, 2024
…ound from release scripts

### What changes were proposed in this pull request?

This PR aims to remove Spark 3.0~3.2 `pyspark/version.py` workaround code from release scripts.

This is a logical revert of SPARK-38411 because Spark 3.0~3.3 are the end of support status.

- #36803

### Why are the changes needed?

To simplify the release script for Apache Spark 4+

### Does this PR introduce _any_ user-facing change?

No.

### How was this patch tested?

Manual review.

### Was this patch authored or co-authored using generative AI tooling?

No.

Closes #45706 from dongjoon-hyun/SPARK-47549.

Authored-by: Dongjoon Hyun <dhyun@apple.com>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants