You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by cl...@apache.org on 2017/09/11 16:15:33 UTC
zeppelin git commit: [ZEPPELIN-2921] does not work conda environment
in python interpreter
Repository: zeppelin
Updated Branches:
refs/heads/master 38ee0c4ba -> 84ac43328
[ZEPPELIN-2921] does not work conda environment in python interpreter
### What is this PR for?
Fixed a problem where conda's library was not installed and reflected properly due to changed python interpreter execution flow and structures.
ORIGINAL : https://github.com/apache/zeppelin/pull/2574
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2921
### How should this be tested?
Please run the following command line for each paragraph.
If the module such as scipy is normally imported, it is a success.
`%python.conda create --name Hello6 python=2.7`
`%python.conda activate Hello6`
`%python.conda install seaborn pandas numpy scipy matplotlib`
```
%python
import scipy as sp
import seaborn as sns
```
`%python.conda deactivate`
### Screenshots (if appropriate)
#### Before
#### After
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: CloverHearts <cl...@gmail.com>
Closes #2578 from cloverhearts/ZEPPELIN-2921 and squashes the following commits:
a09f6801 [CloverHearts] added test case for conda env
9b797269 [CloverHearts] add conda env option on list
8dfb33b1 [CloverHearts] replace conda install environment name
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/84ac4332
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/84ac4332
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/84ac4332
Branch: refs/heads/master
Commit: 84ac43328b2cb7f10279b565e9d685185ce60053
Parents: 38ee0c4
Author: CloverHearts <cl...@gmail.com>
Authored: Mon Sep 11 12:35:34 2017 +0900
Committer: CloverHearts <cl...@gmail.com>
Committed: Tue Sep 12 01:15:24 2017 +0900
----------------------------------------------------------------------
.../zeppelin/python/PythonCondaInterpreter.java | 30 ++++++++++++++++++--
.../python/PythonCondaInterpreterTest.java | 6 ++--
2 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/84ac4332/python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java
----------------------------------------------------------------------
diff --git a/python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java b/python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java
index 455d786..0d122f5 100644
--- a/python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java
+++ b/python/src/main/java/org/apache/zeppelin/python/PythonCondaInterpreter.java
@@ -50,6 +50,8 @@ public class PythonCondaInterpreter extends Interpreter {
public static final Pattern PATTERN_COMMAND_HELP = Pattern.compile("help");
public static final Pattern PATTERN_COMMAND_INFO = Pattern.compile("info");
+ private String currentCondaEnvName = StringUtils.EMPTY;
+
public PythonCondaInterpreter(Properties property) {
super(property);
}
@@ -112,6 +114,17 @@ public class PythonCondaInterpreter extends Interpreter {
}
}
+ public String getCurrentCondaEnvName() {
+ return currentCondaEnvName;
+ }
+
+ public void setCurrentCondaEnvName(String currentCondaEnvName) {
+ if (currentCondaEnvName == null) {
+ currentCondaEnvName = StringUtils.EMPTY;
+ }
+ this.currentCondaEnvName = currentCondaEnvName;
+ }
+
private void changePythonEnvironment(String envName)
throws IOException, InterruptedException {
PythonInterpreter python = getPythonInterpreter();
@@ -130,6 +143,7 @@ public class PythonCondaInterpreter extends Interpreter {
}
}
}
+ setCurrentCondaEnvName(envName);
python.setPythonCommand(binPath);
}
@@ -221,8 +235,12 @@ public class PythonCondaInterpreter extends Interpreter {
private String runCondaList() throws IOException, InterruptedException {
List<String> commands = new ArrayList<String>();
- commands.add("conda");
- commands.add("list");
+ commands.add(0, "conda");
+ commands.add(1, "list");
+ if (!getCurrentCondaEnvName().isEmpty()) {
+ commands.add(2, "-n");
+ commands.add(3, getCurrentCondaEnvName());
+ }
return runCondaCommandForTableOutput("Installed Package List", commands);
}
@@ -259,6 +277,10 @@ public class PythonCondaInterpreter extends Interpreter {
restArgs.add(0, "conda");
restArgs.add(1, "install");
restArgs.add(2, "--yes");
+ if (!getCurrentCondaEnvName().isEmpty()) {
+ restArgs.add(3, "-n");
+ restArgs.add(4, getCurrentCondaEnvName());
+ }
return runCondaCommandForTextOutput("Package Installation", restArgs);
}
@@ -269,6 +291,10 @@ public class PythonCondaInterpreter extends Interpreter {
restArgs.add(0, "conda");
restArgs.add(1, "uninstall");
restArgs.add(2, "--yes");
+ if (!getCurrentCondaEnvName().isEmpty()) {
+ restArgs.add(3, "-n");
+ restArgs.add(4, getCurrentCondaEnvName());
+ }
return runCondaCommandForTextOutput("Package Uninstallation", restArgs);
}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/84ac4332/python/src/test/java/org/apache/zeppelin/python/PythonCondaInterpreterTest.java
----------------------------------------------------------------------
diff --git a/python/src/test/java/org/apache/zeppelin/python/PythonCondaInterpreterTest.java b/python/src/test/java/org/apache/zeppelin/python/PythonCondaInterpreterTest.java
index 28d47e0..8976396 100644
--- a/python/src/test/java/org/apache/zeppelin/python/PythonCondaInterpreterTest.java
+++ b/python/src/test/java/org/apache/zeppelin/python/PythonCondaInterpreterTest.java
@@ -74,12 +74,13 @@ public class PythonCondaInterpreterTest {
@Test
public void testActivateEnv() throws IOException, InterruptedException {
setMockCondaEnvList();
-
+ String envname = "env1";
InterpreterContext context = getInterpreterContext();
- conda.interpret("activate env1", context);
+ conda.interpret("activate " + envname, context);
verify(python, times(1)).open();
verify(python, times(1)).close();
verify(python).setPythonCommand("/path1/bin/python");
+ assertTrue(envname.equals(conda.getCurrentCondaEnvName()));
}
@Test
@@ -89,6 +90,7 @@ public class PythonCondaInterpreterTest {
verify(python, times(1)).open();
verify(python, times(1)).close();
verify(python).setPythonCommand("python");
+ assertTrue(conda.getCurrentCondaEnvName().isEmpty());
}
@Test