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:29 UTC
[06/15] incubator-toree git commit: Making versions optional on the
LanguageInfo object
Making versions optional on the LanguageInfo object
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/a5303b4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/a5303b4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/a5303b4c
Branch: refs/heads/master
Commit: a5303b4c3fd1b971982d1c724b71879faad6eb9b
Parents: c330d3a
Author: Liam Fisk <li...@xtra.co.nz>
Authored: Thu Jun 30 09:05:39 2016 +1200
Committer: Marius van Niekerk <ma...@maxpoint.com>
Committed: Thu Oct 20 17:50:58 2016 -0400
----------------------------------------------------------------------
.../main/scala/org/apache/toree/interpreter/Interpreter.scala | 4 ++--
.../protocol/v5/handler/KernelInfoRequestHandlerSpec.scala | 2 +-
.../scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala | 4 ++--
.../toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala | 2 +-
pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py | 1 -
.../toree/kernel/interpreter/pyspark/PySparkInterpreter.scala | 3 +--
.../apache/toree/kernel/interpreter/scala/ScalaInterpreter.scala | 2 +-
.../toree/kernel/interpreter/sparkr/SparkRInterpreter.scala | 2 +-
.../org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala | 2 +-
9 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
----------------------------------------------------------------------
diff --git a/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala b/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
index 5b9d4c2..edf1e71 100644
--- a/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
+++ b/kernel-api/src/main/scala/org/apache/toree/interpreter/Interpreter.scala
@@ -25,8 +25,8 @@ import scala.tools.nsc.interpreter._
case class LanguageInfo(
name: String,
- version: String,
- fileExtension: String,
+ version: Option[String] = None,
+ fileExtension: Option[String] = None,
pygmentsLexer: Option[String] = None) {
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
----------------------------------------------------------------------
diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
index 04a718f..252f64a 100644
--- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
+++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/handler/KernelInfoRequestHandlerSpec.scala
@@ -42,7 +42,7 @@ class KernelInfoRequestHandlerSpec extends TestKit(
ConfigFactory.parseString(KernelInfoRequestHandlerSpec.config))
) with ImplicitSender with FunSpecLike with Matchers with MockitoSugar {
val actorLoader: ActorLoader = mock[ActorLoader]
- val actor = system.actorOf(Props(classOf[KernelInfoRequestHandler], actorLoader, LanguageInfo("test", "1.0.0", ".test")))
+ val actor = system.actorOf(Props(classOf[KernelInfoRequestHandler], actorLoader, LanguageInfo("test", Some("1.0.0"), Some(".test"))))
val relayProbe : TestProbe = TestProbe()
val relaySelection : ActorSelection =
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
----------------------------------------------------------------------
diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
index 04b85c8..d2d99be 100644
--- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
+++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/LanguageInfo.scala
@@ -19,7 +19,7 @@ package org.apache.toree.kernel.protocol.v5
case class LanguageInfo(
name: String,
- version: String,
- file_extension: String,
+ version: Option[String] = None,
+ file_extension: Option[String] = None,
pygments_lexer: Option[String] = None) {
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
----------------------------------------------------------------------
diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
index b849df8..68c901c 100644
--- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
+++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala
@@ -34,7 +34,7 @@ class KernelInfoReplySpec extends FunSpec with Matchers {
""")
val kernelInfoReply: KernelInfoReply = KernelInfoReply(
- "x.y.z", "<name>", "z.y.x", LanguageInfo("<some language>", "a.b.c", "<some extension>"), "<some banner>"
+ "x.y.z", "<name>", "z.y.x", LanguageInfo("<some language>", Some("a.b.c"), Some("<some extension>")), "<some banner>"
)
describe("KernelInfoReply") {
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
----------------------------------------------------------------------
diff --git a/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py b/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
index 8876e18..d84c5c4 100644
--- a/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
+++ b/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
@@ -76,7 +76,6 @@ sc = None
spark = None
code_info = None
-
class Logger(object):
def __init__(self):
self.out = ""
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/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 784a9ed..e347ed8 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
@@ -151,8 +151,7 @@ class PySparkInterpreter(
// TODO Identify how to plumb python version to here
override def languageInfo = LanguageInfo(
"python",
- "2.7.9",
- ".py",
+ fileExtension = Some(".py"),
pygmentsLexer = Some("ipython2"))
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/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 1cd6d13..464c223 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,6 +338,6 @@ object ScalaInterpreter {
}
- override def languageInfo = LanguageInfo("scala", BuildInfo.scalaVersion, ".scala")
+ override def languageInfo = LanguageInfo("scala", Some(BuildInfo.scalaVersion), Some(".scala"))
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
----------------------------------------------------------------------
diff --git a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
index ff4aa06..c067d5b 100644
--- a/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
+++ b/sparkr-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sparkr/SparkRInterpreter.scala
@@ -139,6 +139,6 @@ class SparkRInterpreter(
// Unsupported
override def doQuietly[T](body: => T): T = ???
- override def languageInfo = LanguageInfo("scala", BuildInfo.scalaVersion, ".scala")
+ override def languageInfo = LanguageInfo("R")
}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/a5303b4c/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
----------------------------------------------------------------------
diff --git a/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala b/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
index 988ef9e..fa7fc2b 100644
--- a/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
+++ b/sql-interpreter/src/main/scala/org/apache/toree/kernel/interpreter/sql/SqlInterpreter.scala
@@ -107,6 +107,6 @@ class SqlInterpreter() extends Interpreter {
// Unsupported
override def doQuietly[T](body: => T): T = ???
- override def languageInfo = LanguageInfo("scala", BuildInfo.scalaVersion, ".scala")
+ override def languageInfo = LanguageInfo("SQL")
}