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

Test fix: disable conda-specific logic when getting list of packages

Browse Source 
See PyExecutionFixtureTestTask comment
This commit is contained in:
Ilya.Kazakevich
2017-07-07 17:52:50 +03:00
parent 8058ccd238
commit 2bc0c8de43
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/testSrc/com/jetbrains/env/PyExecutionFixtureTestTask.java
Vendored
+13 -1
View File
@@ -20,6 +20,8 @@ import com.intellij.testFramework.fixtures.impl.ModuleFixtureImpl;
import com.jetbrains.extensions.ModuleExtKt;
import com.jetbrains.python.PythonModuleTypeBase;
import com.jetbrains.python.PythonTestUtil;
import com.jetbrains.python.packaging.PyCondaPackageManagerImpl;
import com.jetbrains.python.packaging.PyPackageManager;
import com.jetbrains.python.psi.LanguageLevel;
import com.jetbrains.python.sdk.InvalidSdkException;
import com.jetbrains.python.sdk.PythonSdkType;
@@ -241,7 +243,17 @@ public abstract class PyExecutionFixtureTestTask extends PyTestTask {
throws InvalidSdkException, IOException {
final VirtualFile sdkHomeFile = LocalFileSystem.getInstance().findFileByPath(sdkHome);
Assert.assertNotNull("Interpreter file not found: " + sdkHome, sdkHomeFile);
return PyTestSdkTools.createTempSdk(sdkHomeFile, sdkCreationType, myFixture.getModule());
final Sdk sdk = PyTestSdkTools.createTempSdk(sdkHomeFile, sdkCreationType, myFixture.getModule());
// We use gradle script to create environment. This script utilizes Conda.
// Conda supports 2 types of package installation: conda native and pip. We use pip.
// PyCharm Conda support ignores packages installed via pip ("conda list -e" does it, see PyCondaPackageManagerImpl)
// So we need to either fix gradle (PythonEnvsPlugin.groovy on github) or use helper instead of "conda list" to get all packages
// We do the latter.
final PyPackageManager packageManager = PyPackageManager.getInstance(sdk);
if (packageManager instanceof PyCondaPackageManagerImpl) {
((PyCondaPackageManagerImpl)packageManager).useConda = false;
}
return sdk;
}