Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 26 insertions, 16 deletions

diff --git a/python/openapi/src/com/jetbrains/python/packaging/PyPackageManager.java b/python/openapi/src/com/jetbrains/python/packaging/PyPackageManager.java
index 3b2080b00ba1..2a8003c46eaf 100644
--- a/python/openapi/src/com/jetbrains/python/packaging/PyPackageManager.java
+++ b/python/openapi/src/com/jetbrains/python/packaging/PyPackageManager.java
@@ -15,35 +15,45 @@
  */
 package com.jetbrains.python.packaging;
 
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.util.Key;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.awt.*;
+import java.util.List;
+import java.util.Set;
 
 /**
  * @author yole
  */
 public abstract class PyPackageManager {
+  public static final Key<Boolean> RUNNING_PACKAGING_TASKS = Key.create("PyPackageRequirementsInspection.RunningPackagingTasks");
+
+  public static final String PACKAGE_SETUPTOOLS = "setuptools";
+  public static final String PACKAGE_PIP = "pip";
+  public static final String PACKAGE_DISTRIBUTE = "distribute";
+
+  public static final String USE_USER_SITE = "--user";
+
   public static PyPackageManager getInstance(Sdk sdk) {
     return PyPackageManagers.getInstance().forSdk(sdk);
   }
 
-  /**
-   * Returns true if pip is installed for the specific interpreter; returns false if pip is not
-   * installed or if it is not currently known whether it's installed (e.g. for a remote interpreter).
-   *
-   * @return true if pip is known to be installed, false otherwise.
-   */
-  public abstract boolean hasPip();
-  public abstract void install(String requirementString) throws PyExternalProcessException;
-  public abstract void showInstallationError(Project project, String title, String description);
-  public abstract void showInstallationError(Component owner, String title, String description);
+  public abstract void installManagement() throws PyExternalProcessException;
+  public abstract boolean hasManagement(boolean cachedOnly);
+  public abstract void install(@NotNull String requirementString) throws PyExternalProcessException;
+  public abstract void install(@NotNull List<PyRequirement> requirements, @NotNull List<String> extraArgs) throws PyExternalProcessException;
+  public abstract void uninstall(@NotNull List<PyPackage> packages) throws PyExternalProcessException;
   public abstract void refresh();
+  @NotNull
+  public abstract String createVirtualEnv(@NotNull String destinationDir, boolean useGlobalSite) throws PyExternalProcessException;
   @Nullable
-  public abstract PyPackage findInstalledPackage(String name) throws PyExternalProcessException;
-
-  public abstract boolean findPackage(@NotNull final String name);
-
+  public abstract List<PyPackage> getPackages(boolean cachedOnly) throws PyExternalProcessException;
+  @Nullable
+  public abstract PyPackage findPackage(@NotNull String name, boolean cachedOnly) throws PyExternalProcessException;
+  @Nullable
+  public abstract List<PyRequirement> getRequirements(@NotNull Module module);
+  @Nullable
+  public abstract Set<PyPackage> getDependents(@NotNull PyPackage pkg) throws PyExternalProcessException;
 }