MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed PY-14302 IPython Notebook: overlapping balloon notifications on run server failure

Browse Source 
+ check ipython presense in interpreter
This commit is contained in:
Ekaterina Tuzova
2014-11-12 15:49:09 +03:00
parent c4b76fc232
commit dd99704b20
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
+12 -2
View File
@@ -22,6 +22,8 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.PythonHelpersLocator;
import com.jetbrains.python.packaging.PyPackage;
import com.jetbrains.python.packaging.PyPackageManager;
import com.jetbrains.python.sdk.PythonSdkType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -62,7 +64,7 @@ public final class IpnbConnectionManager implements ProjectComponent {
final String path = virtualFile.getPath();
if (!myKernels.containsKey(path)) {
String url = IpnbSettings.getInstance(myProject).getURL();
if (url == null) {
if (StringUtil.isEmptyOrSpaces(url)) {
url = DEFAULT_URL;
}
if (!isAvailable(url)) {
@@ -75,7 +77,6 @@ public final class IpnbConnectionManager implements ProjectComponent {
return;
}
else {
showWarning(fileEditor, "Could not start IPython Notebook");
return;
}
}
@@ -187,6 +188,15 @@ public final class IpnbConnectionManager implements ProjectComponent {
showWarning(fileEditor, "Please check Python Interpreter in Settings->Python Interpreter");
return false;
}
try {
final PyPackage ipythonPackage = PyPackageManager.getInstance(sdk).findPackage("ipython", false);
if (ipythonPackage == null) {
showWarning(fileEditor, "Please check ipython installed in Python Interpreter in Settings->Python Interpreter");
return false;
}
}
catch (ExecutionException ignored) {
}
final Map<String, String> env = ImmutableMap.of("PYCHARM_EP_DIST", "ipython", "PYCHARM_EP_NAME", "ipython");
try {
final String ipython = PythonHelpersLocator.getHelperPath("pycharm/pycharm_load_entry_point.py");