zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject incubator-zeppelin git commit: [ZEPPELIN-799] Add python edit mode.
Date Thu, 14 Apr 2016 07:49:25 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 53451e912 -> 528878112


[ZEPPELIN-799] Add python edit mode.

### What is this PR for?
support python edit mode in paragraph.

### What type of PR is it?
Improvement

### Todos
* [x] - support python edit mode.

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-799

### How should this be tested?
you can refer to screenshot.

### Screenshots (if appropriate)
- before
![image](https://cloud.githubusercontent.com/assets/3348133/14380573/1f6c953e-fdbb-11e5-9132-abf0878b771b.png)

- after
![image](https://cloud.githubusercontent.com/assets/3348133/14379951/f97b7fc8-fdb7-11e5-914e-bac603d43187.png)

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: hsshim <astroshim@gmail.com>

Closes #825 from astroshim/ZEPPELIN-799 and squashes the following commits:

c0d579d [hsshim] fixed for a new interpreter group.
63af8ad [hsshim] add spark.pyspark condition.
b2e23de [hsshim] add python edit mode.


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/52887811
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/52887811
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/52887811

Branch: refs/heads/master
Commit: 528878112fb7b51bad474768ccdfdd16d2ac7109
Parents: 53451e9
Author: hsshim <astroshim@gmail.com>
Authored: Wed Apr 13 10:25:21 2016 +0900
Committer: Alexander Bezzubov <bzz@apache.org>
Committed: Thu Apr 14 16:49:14 2016 +0900

----------------------------------------------------------------------
 zeppelin-web/bower.json                                         | 1 +
 zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/52887811/zeppelin-web/bower.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index c5fc7ab..b5ec64e 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -44,6 +44,7 @@
       "main": [
         "src-noconflict/ace.js",
         "src-noconflict/mode-scala.js",
+        "src-noconflict/mode-python.js",
         "src-noconflict/mode-sql.js",
         "src-noconflict/mode-markdown.js",
         "src-noconflict/mode-sh.js",

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/52887811/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index a5d2fe3..c71e096 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -79,7 +79,8 @@ angular.module('zeppelinWebApp')
   var angularObjectRegistry = {};
 
   var editorModes = {
-    'ace/mode/scala': /^%spark/,
+    'ace/mode/python': /^%(\w*\.)?pyspark\s*$/,
+    'ace/mode/scala': /^%(\w*\.)?spark\s*$/,
     'ace/mode/sql': /^%(\w*\.)?\wql/,
     'ace/mode/markdown': /^%md/,
     'ace/mode/sh': /^%sh/


Mime
View raw message