Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: Use specific command for env list in conda

Browse source
This commit is contained in:
1ambda 2017-01-07 13:33:17 +09:00
parent 99946e719a
commit f0d69bcc96
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java
View file

@ -37,7 +37,7 @@ public class PythonCondaInterpreter extends Interpreter {
public static final String DEFAULT_ZEPPELIN_PYTHON = "python";
Pattern condaEnvListPattern = Pattern.compile("([^\\s]*)[\\s*]*\\s(.*)");
Pattern listPattern = Pattern.compile("env\\s*list\\s?");
Pattern listEnvPattern = Pattern.compile("env\\s*list\\s?");
Pattern activatePattern = Pattern.compile("activate\\s*(.*)");
Pattern deactivatePattern = Pattern.compile("deactivate");
Pattern helpPattern = Pattern.compile("help");
@ -60,12 +60,12 @@ public class PythonCondaInterpreter extends Interpreter {
public InterpreterResult interpret(String st, InterpreterContext context) {
InterpreterOutput out = context.out;
Matcher listMatcher = listPattern.matcher(st);
Matcher listEnvMatcher = listEnvPattern.matcher(st);
Matcher activateMatcher = activatePattern.matcher(st);
Matcher deactivateMatcher = deactivatePattern.matcher(st);
Matcher helpMatcher = helpPattern.matcher(st);
if (st == null || st.isEmpty() || listMatcher.matches()) {
if (st == null || listEnvMatcher.matches()) {
listEnv(out, getCondaEnvs());
return new InterpreterResult(InterpreterResult.Code.SUCCESS);
} else if (activateMatcher.matches()) {

2
python/src/main/resources/output_templates/conda_usage.html
View file

@ -22,6 +22,6 @@ limitations under the License.
</div>
<div>
List the Conda environments
<pre>%python.conda</pre>
<pre>%python.conda env list</pre>
</div>