This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new e98dba639 BIGTOP-4053. Remove Python as Spark Installation Dependency
(#1272)
e98dba639 is described below
commit e98dba639e66feb2fd4e653cb7b8bc9b19bc8ee8
Author: masatana <[email protected]>
AuthorDate: Mon May 27 18:13:56 2024 +0900
BIGTOP-4053. Remove Python as Spark Installation Dependency (#1272)
---
bigtop-packages/src/deb/spark/control | 2 +-
bigtop-packages/src/rpm/spark/SPECS/spark.spec | 13 +++----------
.../org/apache/bigtop/itest/spark/TestSparkExample.groovy | 10 ----------
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/bigtop-packages/src/deb/spark/control
b/bigtop-packages/src/deb/spark/control
index a8f49e71d..44597c25e 100644
--- a/bigtop-packages/src/deb/spark/control
+++ b/bigtop-packages/src/deb/spark/control
@@ -45,7 +45,7 @@ Description: Server for Spark worker
Package: spark-python
Architecture: all
-Depends: spark-core (= ${source:Version}), python | python2
+Depends: spark-core (= ${source:Version})
Description: Python client for Spark
Includes PySpark, an interactive Python shell for Spark, and related libraries
diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
index 146326dc1..f42f58be3 100644
--- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec
+++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec
@@ -116,16 +116,9 @@ Server for Spark worker
%package -n %{spark_pkg_name}-python
Summary: Python client for Spark
Group: Development/Libraries
-# BIGTOP-4073 rockylinux 8 use python2, rockylinux 9 use python3
-%if 0%{?rhel} >= 8 || 0%{?openEuler}
-%if 0%{?rhel} == 8
-Requires: %{spark_pkg_name}-core = %{version}-%{release}, python2
-%else
-Requires: %{spark_pkg_name}-core = %{version}-%{release}, python3
-%endif
-%else
-Requires: %{spark_pkg_name}-core = %{version}-%{release}, python
-%endif
+# No python dependency. You might need to install Python by yourself.
+# See BIGTOP-4052 for details.
+Requires: %{spark_pkg_name}-core = %{version}-%{release}
%description -n %{spark_pkg_name}-python
Includes PySpark, an interactive Python shell for Spark, and related libraries
diff --git
a/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkExample.groovy
b/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkExample.groovy
index 02cd161f6..5dde20229 100644
---
a/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkExample.groovy
+++
b/bigtop-tests/test-artifacts/spark/src/main/groovy/org/apache/bigtop/itest/spark/TestSparkExample.groovy
@@ -66,14 +66,4 @@ public class TestSparkExample {
}
}
- @Test
- void testSparkPythonExample() {
- def pyExamples = ["pi.py"];
- pyExamples.each() {
- sh.exec("cd ${SPARK_HOME} && ./bin/spark-submit --master ${SPARK_MASTER}
" + SPARK_EXAMPLES_DIR + "/src/main/python/${it}");
- logError(sh);
- assertTrue("Running Spark Python example {it} failed", sh.getRet() == 0);
- }
- }
-
}