You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by lb...@apache.org on 2016/05/06 16:42:46 UTC
[1/4] incubator-toree git commit: Makes add deps installation
directory either a specified path or a unique temp path per toree process.
Repository: incubator-toree
Updated Branches:
refs/heads/master 0a9068a2f -> 31b2039ee
Makes add deps installation directory either a specified
path or a unique temp path per toree process.
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/58ab0d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/58ab0d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/58ab0d80
Branch: refs/heads/master
Commit: 58ab0d8037bbd2dd6b33bb565ea2dbec59cc5b7a
Parents: 0a9068a
Author: Michael Poplavski <mi...@gmail.com>
Authored: Fri Apr 22 12:23:32 2016 -0500
Committer: Michael Poplavski <mi...@gmail.com>
Committed: Wed May 4 14:52:45 2016 -0500
----------------------------------------------------------------------
.../toree/boot/layer/ComponentInitialization.scala | 14 ++++++++++----
resources/compile/reference.conf | 5 ++---
resources/test/reference.conf | 3 +--
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/58ab0d80/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala b/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
index a7194eb..fb7e76d 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/layer/ComponentInitialization.scala
@@ -18,6 +18,7 @@
package org.apache.toree.boot.layer
import java.io.File
+import java.nio.file.{Paths, Files}
import java.util.concurrent.ConcurrentHashMap
import akka.actor.ActorRef
@@ -116,12 +117,17 @@ trait StandardComponentInitialization extends ComponentInitialization {
}
private def initializeDependencyDownloader(config: Config) = {
- /*val dependencyDownloader = new IvyDependencyDownloader(
- "http://repo1.maven.org/maven2/", config.getString("ivy_local")
- )*/
+ val depsDir = {
+ if(config.hasPath("deps_dir") && Files.exists(Paths.get(config.getString("deps_dir")))) {
+ config.getString("deps_dir")
+ } else {
+ Files.createTempDirectory("toree_add_deps").toFile.getAbsolutePath
+ }
+ }
+
val dependencyDownloader = new CoursierDependencyDownloader
dependencyDownloader.setDownloadDirectory(
- new File(config.getString("ivy_local"))
+ new File(depsDir)
)
dependencyDownloader
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/58ab0d80/resources/compile/reference.conf
----------------------------------------------------------------------
diff --git a/resources/compile/reference.conf b/resources/compile/reference.conf
index 18efe52..1c23174 100644
--- a/resources/compile/reference.conf
+++ b/resources/compile/reference.conf
@@ -37,9 +37,6 @@ transport = "tcp"
signature_scheme = "hmac-sha256"
key = ""
-ivy_local = "/tmp/.ivy2"
-ivy_local = ${?IVY_LOCAL}
-
interpreter_args = []
magic_urls = []
@@ -53,6 +50,8 @@ send_empty_output = ${?SEND_EMPTY_OUTPUT}
jar_dir = ${?JAR_DIR}
+deps_dir = ${?DEPS_DIR}
+
default_interpreter = "Scala"
default_interpreter = ${?DEFAULT_INTERPRETER}
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/58ab0d80/resources/test/reference.conf
----------------------------------------------------------------------
diff --git a/resources/test/reference.conf b/resources/test/reference.conf
index 461d4e8..85e614c 100644
--- a/resources/test/reference.conf
+++ b/resources/test/reference.conf
@@ -38,8 +38,7 @@ signature_scheme = "hmac-sha256"
key = ""
spark.master = "local[*]"
-ivy_local = "/tmp/.ivy2"
-ivy_local = ${?IVY_LOCAL}
+deps_dir = ${?DEPS_DIR}
interpreter_args = []
[4/4] incubator-toree git commit: [skip ci] Changing the name of the
kernel used sample notebook
Posted by lb...@apache.org.
[skip ci] Changing the name of the kernel used sample notebook
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/31b2039e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/31b2039e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/31b2039e
Branch: refs/heads/master
Commit: 31b2039ee762f8dd6dc1c9d5df25ffcc43d68e2f
Parents: f17b4ee
Author: Gino Bustelo <lb...@apache.org>
Authored: Fri May 6 11:42:28 2016 -0500
Committer: Gino Bustelo <lb...@apache.org>
Committed: Fri May 6 11:42:28 2016 -0500
----------------------------------------------------------------------
etc/examples/notebooks/magic-tutorial.ipynb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/31b2039e/etc/examples/notebooks/magic-tutorial.ipynb
----------------------------------------------------------------------
diff --git a/etc/examples/notebooks/magic-tutorial.ipynb b/etc/examples/notebooks/magic-tutorial.ipynb
index c21e71e..8725868 100644
--- a/etc/examples/notebooks/magic-tutorial.ipynb
+++ b/etc/examples/notebooks/magic-tutorial.ipynb
@@ -783,9 +783,9 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Toree",
- "language": "",
- "name": "toree"
+ "display_name": "Apache Toree - Scala",
+ "language": "scala",
+ "name": "apache_toree_scala"
},
"language_info": {
"name": "scala"
[2/4] incubator-toree git commit: Update the magic-tutorial notebook
to reflect the changes to make add deps dir unique
Posted by lb...@apache.org.
Update the magic-tutorial notebook to reflect the changes to make add deps dir unique
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/ddfa9028
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/ddfa9028
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/ddfa9028
Branch: refs/heads/master
Commit: ddfa90287614f54f254339c9f05b197ea07fd78d
Parents: 58ab0d8
Author: Michael Poplavski <mi...@gmail.com>
Authored: Tue May 3 16:25:29 2016 -0500
Committer: Michael Poplavski <mi...@gmail.com>
Committed: Wed May 4 14:56:11 2016 -0500
----------------------------------------------------------------------
etc/examples/notebooks/magic-tutorial.ipynb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/ddfa9028/etc/examples/notebooks/magic-tutorial.ipynb
----------------------------------------------------------------------
diff --git a/etc/examples/notebooks/magic-tutorial.ipynb b/etc/examples/notebooks/magic-tutorial.ipynb
index ad69aa3..c21e71e 100644
--- a/etc/examples/notebooks/magic-tutorial.ipynb
+++ b/etc/examples/notebooks/magic-tutorial.ipynb
@@ -443,7 +443,7 @@
"text": [
"Marking org.joda:joda-money:0.11 for download\n",
"Preparing to fetch from:\n",
- "-> file:/tmp/.ivy2/\n",
+ "-> file:/tmp/toree_add_deps5662724810625125387/\n",
"-> https://repo1.maven.org/maven2\n",
"=> 1 (): Downloading https://repo1.maven.org/maven2/org/joda/joda-money/0.11/joda-money-0.11.pom.sha1\n",
"=> 1 (): Downloading https://repo1.maven.org/maven2/org/joda/joda-money/0.11/joda-money-0.11.pom\n",
@@ -465,7 +465,7 @@
"===> 2 (joda-money-0.11.jar): Downloaded 48481 bytes (76.08%)\n",
"===> 2 (joda-money-0.11.jar): Downloaded 63725 bytes (100.00%)\n",
"=> 2 (joda-money-0.11.jar): Finished downloading\n",
- "-> New file at /tmp/.ivy2/https/repo1.maven.org/maven2/org/joda/joda-money/0.11/joda-money-0.11.jar\n"
+ "-> New file at /tmp/toree_add_deps5662724810625125387/https/repo1.maven.org/maven2/org/joda/joda-money/0.11/joda-money-0.11.jar\n"
]
}
],
@@ -783,9 +783,9 @@
],
"metadata": {
"kernelspec": {
- "display_name": "Toree - Scala",
- "language": "scala",
- "name": "toree_scala"
+ "display_name": "Toree",
+ "language": "",
+ "name": "toree"
},
"language_info": {
"name": "scala"
[3/4] incubator-toree git commit: Update jar dir location to toree
from spark_kernel
Posted by lb...@apache.org.
Update jar dir location to toree from spark_kernel
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/f17b4ee7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/f17b4ee7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/f17b4ee7
Branch: refs/heads/master
Commit: f17b4ee77e0de5b02d6b85dc1ee9cc8d47298313
Parents: ddfa902
Author: Michael Poplavski <mi...@gmail.com>
Authored: Wed May 4 14:59:52 2016 -0500
Committer: Michael Poplavski <mi...@gmail.com>
Committed: Wed May 4 15:02:13 2016 -0500
----------------------------------------------------------------------
kernel/src/main/scala/org/apache/toree/magic/builtin/AddJar.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/f17b4ee7/kernel/src/main/scala/org/apache/toree/magic/builtin/AddJar.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/magic/builtin/AddJar.scala b/kernel/src/main/scala/org/apache/toree/magic/builtin/AddJar.scala
index 125ee0a..a8bf14b 100644
--- a/kernel/src/main/scala/org/apache/toree/magic/builtin/AddJar.scala
+++ b/kernel/src/main/scala/org/apache/toree/magic/builtin/AddJar.scala
@@ -37,7 +37,7 @@ object AddJar {
if(config.hasPath("jar_dir") && Files.exists(Paths.get(config.getString("jar_dir")))) {
config.getString("jar_dir")
} else {
- Files.createTempDirectory("spark_kernel_add_jars").toFile.getAbsolutePath
+ Files.createTempDirectory("toree_add_jars").toFile.getAbsolutePath
}
)
jarDir.get