You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ma...@apache.org on 2016/11/07 14:29:27 UTC
[04/15] incubator-toree git commit: Fixing jupyter tests
Fixing jupyter tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/ccd711a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/ccd711a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/ccd711a4
Branch: refs/heads/master
Commit: ccd711a4e51bbaeb15363d5f04f971d2d849cdcb
Parents: fe4290d
Author: Liam Fisk <li...@xtra.co.nz>
Authored: Sun Jun 19 16:41:45 2016 +1200
Committer: Marius van Niekerk <ma...@maxpoint.com>
Committed: Thu Oct 20 17:50:57 2016 -0400
----------------------------------------------------------------------
.../toree/kernel/interpreter/pyspark/PySparkInterpreter.scala | 3 ++-
.../toree/kernel/interpreter/scala/ScalaInterpreter.scala | 6 ++++--
test_toree.py | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/ccd711a4/pyspark-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/pyspark/PySparkInterpreter.scala
----------------------------------------------------------------------
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 388076b..a192c78 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
@@ -152,6 +152,7 @@ class PySparkInterpreter(
override def languageInfo: Map[String, String] = Map(
"name" -> "python",
"version" -> "2.7.9",
- "pygments_lexer" -> "ipython2")
+ "pygments_lexer" -> "ipython2",
+ "file_extension" -> ".py")
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/ccd711a4/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
----------------------------------------------------------------------
diff --git a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
index 4df3158..bb198a7 100644
--- a/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
+++ b/scala-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala
@@ -338,7 +338,9 @@ object ScalaInterpreter {
}
- override def languageInfo: Map[String, String] = Map("name" -> "scala", "version" -> BuildInfo.scalaVersion)
+ override def languageInfo: Map[String, String] = Map(
+ "name" -> "scala",
+ "version" -> BuildInfo.scalaVersion,
+ "file_extension" -> ".scala")
}
-
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/ccd711a4/test_toree.py
----------------------------------------------------------------------
diff --git a/test_toree.py b/test_toree.py
index 2e25324..2df1978 100644
--- a/test_toree.py
+++ b/test_toree.py
@@ -129,7 +129,7 @@ class ToreePythonKernelTests(jupyter_kernel_test.KernelTests):
kernel_name = "apache_toree_pyspark"
# language_info.name in a kernel_info_reply should match this
- language_name = "scala"
+ language_name = "python"
# Optional --------------------------------------