You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lr...@apache.org on 2026/09/22 13:36:53 UTC
(incubator-toree) 03/03: Drop assembly POM from pip package staging dirs
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch revert-apache-jar-prefix
in repository https://gitbox.apache.org/repos/asf/incubator-toree.git
commit 7cd3c80c2723382e8b1452880a26f83224fb2bbd
Author: Luciano Resende <lr...@apple.com>
AuthorDate: Tue Sep 22 14:23:00 2026 +0200
Drop assembly POM from pip package staging dirs
dist/toree-pip and dist/apache-toree-pip both stage their contents by
running cp -r dist/toree, which copies the whole binary-distribution
tree verbatim - including the Maven assembly POM that dist/toree/
carries for the bin distribution. That POM has no purpose in either
pip package and was ending up in the staged toree/ package dir
alongside bin/ and lib/, confirmed by reproducing the Makefile's copy
steps locally.
Remove it right after the copy in both pip targets. dist/toree and the
bin-release tarball, which legitimately need the POM, are untouched.
---
Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Makefile b/Makefile
index b7063b0d..d3eb26f6 100644
--- a/Makefile
+++ b/Makefile
@@ -246,6 +246,7 @@ dist/toree-pip/toree-$(VERSION).tar.gz: DOCKER_WORKDIR=/srv/toree/dist/toree-pip
dist/toree-pip/toree-$(VERSION).tar.gz: dist/toree
@mkdir -p dist/toree-pip
@cp -r dist/toree dist/toree-pip
+ @rm -f dist/toree-pip/toree/$(ASSEMBLY_POM)
@cp dist/toree/LICENSE dist/toree-pip/LICENSE
@cp dist/toree/NOTICE dist/toree-pip/NOTICE
@cp dist/toree/DISCLAIMER dist/toree-pip/DISCLAIMER
@@ -264,6 +265,7 @@ dist/apache-toree-pip/apache-toree-$(VERSION).tar.gz: DOCKER_WORKDIR=/srv/toree/
dist/apache-toree-pip/apache-toree-$(VERSION).tar.gz: dist/toree
@mkdir -p dist/apache-toree-pip
@cp -r dist/toree dist/apache-toree-pip
+ @rm -f dist/apache-toree-pip/toree/$(ASSEMBLY_POM)
@cp dist/toree/LICENSE dist/apache-toree-pip/LICENSE
@cp dist/toree/NOTICE dist/apache-toree-pip/NOTICE
@cp dist/toree/DISCLAIMER dist/apache-toree-pip/DISCLAIMER