You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by cs...@apache.org on 2016/05/03 00:13:32 UTC
incubator-toree git commit: [skip ci] Default to use SPARK_HOME env
during install
Repository: incubator-toree
Updated Branches:
refs/heads/master 19d96523a -> 966e63e7d
[skip ci] Default to use SPARK_HOME env during install
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/966e63e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/966e63e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/966e63e7
Branch: refs/heads/master
Commit: 966e63e7d0fe45ae1b4f0b064fa7efe42acf8a09
Parents: 19d9652
Author: Gino Bustelo <lb...@apache.org>
Authored: Fri Apr 29 15:49:54 2016 -0500
Committer: Gino Bustelo <lb...@apache.org>
Committed: Fri Apr 29 15:50:04 2016 -0500
----------------------------------------------------------------------
etc/pip_install/toree/toreeapp.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/966e63e7/etc/pip_install/toree/toreeapp.py
----------------------------------------------------------------------
diff --git a/etc/pip_install/toree/toreeapp.py b/etc/pip_install/toree/toreeapp.py
index e7be0ac..84dad4c 100644
--- a/etc/pip_install/toree/toreeapp.py
+++ b/etc/pip_install/toree/toreeapp.py
@@ -15,10 +15,9 @@
# limitations under the License.
#
+import os
import os.path
-import sys
import json
-import shutil
from os import listdir
from traitlets import Unicode, Dict, Set
from jupyter_client.kernelspecapp import InstallKernelSpec
@@ -55,7 +54,7 @@ class ToreeInstall(InstallKernelSpec):
jupyter toree install --python=python
'''
- spark_home = Unicode('/usr/local/spark', config=True,
+ spark_home = Unicode(os.getenv(SPARK_HOME, '/usr/local/spark'), config=True,
help='''Specify where the spark files can be found.'''
)
kernel_name = Unicode('Apache Toree', config=True,