Skip to content

[SPARK-57130][BUILD] make-distribution.sh copies only git-tracked files for python #56186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pan3793 wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −1
Open

[SPARK-57130][BUILD] make-distribution.sh copies only git-tracked files for python #56186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
625392b
[SPARK-57130][BUILD] `make-distribution.sh` copies only git-tracked f…
pan3793 May 28, 2026
620f075
add -0 for cpio
pan3793 May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dev/make-distribution.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,11 @@ mkdir "$DISTDIR/conf"
cp "$SPARK_HOME"/conf/*.template "$DISTDIR/conf"
cp "$SPARK_HOME/README.md" "$DISTDIR"
cp -r "$SPARK_HOME/bin" "$DISTDIR"
cp -r "$SPARK_HOME/python" "$DISTDIR"
if command -v git && command -v cpio && git rev-parse --git-dir 2>/dev/null; then
Copy link
Copy Markdown
Member

@sarutak sarutak May 28, 2026

Choose a reason for hiding this comment

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

To keep the console clean, how about redirecting the stdout/stderr of command -v to /dev/null?

Copy link
Copy Markdown
Member Author

@pan3793 pan3793 May 28, 2026

Choose a reason for hiding this comment

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

it follows the existing command -v pattern, e.g., in line 128 if [ $(command -v git) ]; then

Copy link
Copy Markdown
Member

@sarutak sarutak May 28, 2026

Choose a reason for hiding this comment

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

Got it. Let's fix all the occurrences of such pattern in the separate PR if we should do it.

git ls-files -z "$SPARK_HOME/python" | cpio -0pdm "$DISTDIR"
else
cp -r "$SPARK_HOME/python" "$DISTDIR"
fi

# Remove the python distribution from dist/ if we built it
if [ "$MAKE_PIP" == "true" ]; then
Expand Down