From 00dbe397018a1d1357b8be185534fc9bc6a5b83b Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Tue, 24 Nov 2015 15:30:58 +0300 Subject: [PATCH] fixed PY-17096 Doesn't see any of my installed packages when using miniconda interpreter. added pip-installed packages to the list of installed packages --- .../python/packaging/PyCondaPackageManagerImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java index 961eb916461b..10eccae19872 100644 --- a/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java +++ b/python/src/com/jetbrains/python/packaging/PyCondaPackageManagerImpl.java @@ -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 getPackages() throws ExecutionException { final ProcessOutput output = getCondaOutput("list", Lists.newArrayList("-e")); - return parseCondaToolOutput(output.getStdout()); + final Set packages = Sets.newConcurrentHashSet(parseCondaToolOutput(output.getStdout())); + packages.addAll(super.getPackages()); + return Lists.newArrayList(packages); } @NotNull