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-17096 Doesn't see any of my installed packages when using miniconda interpreter.

Browse Source 
added pip-installed packages to the list of installed packages
This commit is contained in:
Ekaterina Tuzova
2015-11-24 15:32:14 +03:00
parent d1c6180d77
commit 00dbe39701
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java
+5 -4
View File
@@ -16,6 +16,7 @@
package com.jetbrains.python.packaging;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.RunCanceledByUserException;
import com.intellij.execution.configurations.GeneralCommandLine;
@@ -32,9 +33,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.*;
public class PyCondaPackageManagerImpl extends PyPackageManagerImpl {
public static final String PYTHON = "python";
@@ -145,7 +144,9 @@ public class PyCondaPackageManagerImpl extends PyPackageManagerImpl {
@Override
protected List<PyPackage> getPackages() throws ExecutionException {
final ProcessOutput output = getCondaOutput("list", Lists.newArrayList("-e"));
return parseCondaToolOutput(output.getStdout());
final Set<PyPackage> packages = Sets.newConcurrentHashSet(parseCondaToolOutput(output.getStdout()));
packages.addAll(super.getPackages());
return Lists.newArrayList(packages);
}
@NotNull