MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-04 12:17:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-82119 Packaging: Fix env tests for conda

Browse Source 
Signed-off-by: Nikita.Ashihmin <nikita.ashihmin@jetbrains.com>

GitOrigin-RevId: 47286211e8ca894aa2e04c3f65528a2ab22fc37c
This commit is contained in:
Nikita.Ashihmin
2025-06-25 17:56:19 +04:00
committed by intellij-monorepo-bot
parent 3156c22dee
commit 024d2ae147
24 changed files with 115 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/python-exec-service/execService.python/src/advancedApi/advancedApi.kt
View File

@@ -6,7 +6,6 @@ import com.intellij.python.community.execService.impl.transformerToHandler
import com.intellij.python.community.execService.python.HelperName
import com.intellij.python.community.execService.python.impl.validatePythonAndGetVersionImpl
import com.intellij.python.community.helpersLocator.PythonHelpersLocator
import com.jetbrains.python.errorProcessing.PyExecResult
import com.jetbrains.python.errorProcessing.PyResult
import com.jetbrains.python.psi.LanguageLevel
import org.jetbrains.annotations.ApiStatus
@@ -21,7 +20,7 @@ suspend fun <T> ExecService.executePythonAdvanced(
argsBuilder: suspend ArgsBuilder.() -> Unit = {},
options: ExecOptions = ExecOptions(),
processInteractiveHandler: ProcessInteractiveHandler<T>,
): PyExecResult<T> =
): PyResult<T> =
executeAdvanced(python.binary, {
addArgs(*python.args.toTypedArray())
argsBuilder()
@@ -39,7 +38,7 @@ suspend fun <T> ExecService.executeHelperAdvanced(
options: ExecOptions = ExecOptions(),
procListener: PyProcessListener? = null,
processOutputTransformer: ProcessOutputTransformer<T>,
): PyExecResult<T> = executePythonAdvanced(python, {
): PyResult<T> = executePythonAdvanced(python, {
addLocalFile(PythonHelpersLocator.findPathInHelpers(helper))
addArgs(*args.toTypedArray())

3
python/python-exec-service/execService.python/src/api.kt
View File

@@ -9,7 +9,6 @@ import com.intellij.python.community.execService.python.advancedApi.ExecutablePy
import com.intellij.python.community.execService.python.advancedApi.executeHelperAdvanced
import com.intellij.python.community.execService.python.advancedApi.validatePythonAndGetVersion
import com.jetbrains.python.PythonBinary
import com.jetbrains.python.errorProcessing.PyExecResult
import com.jetbrains.python.errorProcessing.PyResult
import com.jetbrains.python.psi.LanguageLevel
import org.jetbrains.annotations.ApiStatus
@@ -24,7 +23,7 @@ suspend fun ExecService.executeHelper(
args: List<String> = emptyList(),
options: ExecOptions = ExecOptions(),
procListener: PyProcessListener? = null,
): PyExecResult<String> =
): PyResult<String> =
executeHelperAdvanced(ExecutablePython.vanillaExecutablePython(python), helper, args, options, procListener, ZeroCodeStdoutTransformer)
/**