From 76d0ae915b5e92ed3f41357505981912e0b44c62 Mon Sep 17 00:00:00 2001 From: "MINSK\\Andrei_Lysiuk" Date: Fri, 8 Sep 2017 15:43:35 +0300 Subject: [PATCH 1/3] Fix lang info v.1 --- .../kernel/interpreter/pyspark/PySparkInterpreter.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala index 3ff3a52d0..b2735dd40 100644 --- a/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala +++ b/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala @@ -166,10 +166,10 @@ class PySparkInterpreter( LanguageInfo( "python", - version = version, + version = version.trim(), fileExtension = Some(".py"), - pygmentsLexer = Some("python"), - mimeType = Some("text/x-ipython"), - codemirrorMode = Some("text/x-ipython")) + pygmentsLexer = Some("ipython"), + mimeType = Some("text/x-python"), + codemirrorMode = Some("ipython")) } } From 6fbb83a6f04ea5bab74b0de1366f4076fb740187 Mon Sep 17 00:00:00 2001 From: Andrei Lysiuk Date: Thu, 14 Sep 2017 11:42:55 +0300 Subject: [PATCH 2/3] Fixed setting PYTHON_PATH variable --- etc/pip_install/toree/toreeapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/pip_install/toree/toreeapp.py b/etc/pip_install/toree/toreeapp.py index 84dad4c83..6a648442e 100644 --- a/etc/pip_install/toree/toreeapp.py +++ b/etc/pip_install/toree/toreeapp.py @@ -105,7 +105,7 @@ def create_kernel_json(self, location, interpreter): TOREE_SPARK_OPTS : self.spark_opts, TOREE_OPTS : self.toree_opts, SPARK_HOME : self.spark_home, - PYTHON_PATH : '{0}/python:{0}/python/lib/{1}'.format(self.spark_home, py4j_zip), + PYTHON_PATH : '{0}/python:{0}/python/lib/{1}:$PYTHON_PATH'.format(self.spark_home, py4j_zip), PYTHON_EXEC : self.python_exec } From 0b273f7d0722ee736a52e963e4e5572087cd4377 Mon Sep 17 00:00:00 2001 From: "MINSK\\Andrei_Lysiuk" Date: Thu, 14 Sep 2017 14:07:17 +0300 Subject: [PATCH 3/3] Fixed setting PYTHONPATH variable --- etc/pip_install/toree/toreeapp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/pip_install/toree/toreeapp.py b/etc/pip_install/toree/toreeapp.py index 6a648442e..25cd0bd53 100644 --- a/etc/pip_install/toree/toreeapp.py +++ b/etc/pip_install/toree/toreeapp.py @@ -105,7 +105,7 @@ def create_kernel_json(self, location, interpreter): TOREE_SPARK_OPTS : self.spark_opts, TOREE_OPTS : self.toree_opts, SPARK_HOME : self.spark_home, - PYTHON_PATH : '{0}/python:{0}/python/lib/{1}:$PYTHON_PATH'.format(self.spark_home, py4j_zip), + PYTHON_PATH : '{0}/python:{0}/python/lib/{1}:$PYTHONPATH'.format(self.spark_home, py4j_zip), PYTHON_EXEC : self.python_exec }