This is an automated email from the ASF dual-hosted git repository. mykolabodnar pushed a commit to branch DLAB-1409 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit cfd61bc8e98af6fa54c48190b76f0b7b2121d763 Author: Mykola_Bodnar1 <bodnarmyk...@gmail.com> AuthorDate: Wed Jan 15 12:57:07 2020 +0200 [DLAB-1409] - Local Spark Scala version on Juopyter UI fixed --- .../src/jupyter/scripts/configure_jupyter_node.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py b/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py index 064d492..3cfa0ac 100644 --- a/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py +++ b/infrastructure-provisioning/src/jupyter/scripts/configure_jupyter_node.py @@ -107,6 +107,7 @@ if __name__ == "__main__": # INSTALL SPARK AND CLOUD STORAGE JARS FOR SPARK print("Install local Spark") ensure_local_spark(args.os_user, spark_link, spark_version, hadoop_version, local_spark_path) + local_spark_scala_version = sudo('spark-submit --version 2>&1 | grep -o -P "Scala version \K.{0,7}"') print("Install storage jars") ensure_local_jars(args.os_user, jars_dir) print("Configure local Spark") @@ -118,7 +119,7 @@ if __name__ == "__main__": print("Install py3spark local kernel for Jupyter") ensure_py3spark_local_kernel(args.os_user, py3spark_local_path_dir, templates_dir, spark_version) print("Install Toree-Scala kernel for Jupyter") - ensure_toree_local_kernel(args.os_user, toree_link, scala_kernel_path, files_dir, args.scala_version, spark_version) + ensure_toree_local_kernel(args.os_user, toree_link, scala_kernel_path, files_dir, local_spark_scala_version, spark_version) if os.environ['notebook_r_enabled'] == 'true': print("Install R kernel for Jupyter") ensure_r_local_kernel(spark_version, args.os_user, templates_dir, r_kernels_dir) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org