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

PY-24845 Hang on installing jupiter package via Fix button in Run Configuration

Browse Source
This commit is contained in:
Ekaterina Tuzova
2017-06-22 15:10:17 +03:00
parent f3ab28a9ea
commit d6476b99f7
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ipnb/src/org/jetbrains/plugins/ipnb/run/IpnbRunConfiguration.java
+26 -6
View File
@@ -1,5 +1,6 @@
package org.jetbrains.plugins.ipnb.run;
import com.google.common.collect.Lists;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.ConfigurationFactory;
@@ -9,6 +10,9 @@ import com.intellij.execution.configurations.RuntimeConfigurationException;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.InvalidDataException;
@@ -18,6 +22,8 @@ import com.intellij.openapi.util.text.StringUtil;
import com.jetbrains.python.packaging.PyPackage;
import com.jetbrains.python.packaging.PyPackageManager;
import com.jetbrains.python.packaging.PyPackageUtil;
import com.jetbrains.python.packaging.PyRequirement;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.run.AbstractPythonRunConfiguration;
import com.jetbrains.python.run.DebugAwareConfiguration;
import org.jdom.Element;
@@ -90,13 +96,27 @@ public class IpnbRunConfiguration extends AbstractPythonRunConfiguration<IpnbRun
final PyPackage jupyterPackage = packages != null ? PyPackageUtil.findPackage(packages, "jupyter") : null;
if (ipythonPackage == null && jupyterPackage == null) {
throw new RuntimeConfigurationError("Install Jupyter Notebook to the interpreter of the current project.",
() -> {
try {
PyPackageManager.getInstance(sdk).install("jupyter");
() -> ProgressManager.getInstance().run(new Task.Backgroundable(getProject(),
"Installing Jupyter", false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
try {
final String version = sdk.getVersionString();
if (version != null) {
final LanguageLevel level = LanguageLevel.fromPythonVersion(version);
if (level.isAtLeast(LanguageLevel.PYTHON33)) {
PyPackageManager.getInstance(sdk).install("jupyter");
}
else {
PyPackageManager.getInstance(sdk).install(Lists.newArrayList(
PyRequirement.fromLine("ipython==5"), PyRequirement.fromLine("jupyter")),
Lists.newArrayList());
}
}
}
catch (ExecutionException ignored) { }
}
catch (ExecutionException ignored) {
}
});
}));
}
}