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

Use Python SDK name as key instead of home path (PY-18785)

Browse Source 
The problem is similar to PY-20263.
This commit is contained in:
Andrey Vlasovskikh
2016-08-17 21:05:30 +03:00
parent bee7e763ed
commit d486e40723
1 changed files with 8 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/PyPackageManagersImpl.java
+8 -91
View File
@@ -15,21 +15,17 @@
*/
package com.jetbrains.python.packaging;
import com.intellij.execution.ExecutionException;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.packaging.ui.PyCondaManagementService;
import com.jetbrains.python.packaging.ui.PyPackageManagementService;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.HashMap;
import java.util.Map;
/**
* @author yole
@@ -39,11 +35,8 @@ public class PyPackageManagersImpl extends PyPackageManagers {
@NotNull
public synchronized PyPackageManager forSdk(@NotNull final Sdk sdk) {
final String homePath = sdk.getHomePath();
if (homePath == null) {
return new DummyPackageManager(sdk);
}
PyPackageManagerImpl manager = myInstances.get(homePath);
final String key = PythonSdkType.getSdkKey(sdk);
PyPackageManagerImpl manager = myInstances.get(key);
if (manager == null) {
if (PythonSdkType.isRemote(sdk)) {
manager = new PyRemotePackageManagerImpl(sdk);
@@ -55,7 +48,7 @@ public class PyPackageManagersImpl extends PyPackageManagers {
manager = new PyPackageManagerImpl(sdk);
}
if (sdkIsSetUp(sdk))
myInstances.put(homePath, manager);
myInstances.put(key, manager);
}
return manager;
}
@@ -74,85 +67,9 @@ public class PyPackageManagersImpl extends PyPackageManagers {
@Override
public void clearCache(@NotNull Sdk sdk) {
if (myInstances.containsKey(sdk.getHomePath())) {
myInstances.remove(sdk.getHomePath());
final String key = PythonSdkType.getSdkKey(sdk);
if (myInstances.containsKey(key)) {
myInstances.remove(key);
}
}
static class DummyPackageManager extends PyPackageManager {
private final String myName;
private final LanguageLevel myLanguageLevel;
private final PythonSdkFlavor myFlavor;
public DummyPackageManager(@NotNull final Sdk sdk) {
myName = sdk.getName();
myLanguageLevel = PythonSdkType.getLanguageLevelForSdk(sdk);
myFlavor = PythonSdkFlavor.getFlavor(sdk);
}
@Override
public void installManagement() throws ExecutionException {
throw new ExecutionException(getErrorMessage());
}
@Override
public boolean hasManagement() throws ExecutionException {
return false;
}
@NotNull
private String getErrorMessage() {
return "Invalid interpreter \"" + myName + "\" version: " + myLanguageLevel.toString() + " type: " + myFlavor.getName();
}
@Override
public void install(@NotNull String requirementString) throws ExecutionException {
throw new ExecutionException(getErrorMessage());
}
@Override
public void install(@NotNull List<PyRequirement> requirements, @NotNull List<String> extraArgs) throws ExecutionException {
throw new ExecutionException(getErrorMessage());
}
@Override
public void uninstall(@NotNull List<PyPackage> packages) throws ExecutionException {
throw new ExecutionException(getErrorMessage());
}
@Override
public void refresh() {
}
@NotNull
@Override
public String createVirtualEnv(@NotNull String destinationDir, boolean useGlobalSite) throws ExecutionException {
throw new ExecutionException(getErrorMessage());
}
@Nullable
@Override
public List<PyPackage> getPackages() {
return null;
}
@NotNull
@Override
public List<PyPackage> refreshAndGetPackages(boolean alwaysRefresh) throws ExecutionException {
throw new ExecutionException(getErrorMessage());
}
@Nullable
@Override
public List<PyRequirement> getRequirements(@NotNull Module module) {
return null;
}
@NotNull
@Override
public Set<PyPackage> getDependents(@NotNull PyPackage pkg) throws ExecutionException {
throw new ExecutionException(getErrorMessage());
}
}
}