MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

tweak initializing uv env; PY-75983; #PY-77715 Fixed

Browse Source 
(cherry picked from commit e4c5af263e33b445bbdc4b1de7ed8aacea98b101)

GitOrigin-RevId: 897dd009b192fa2adb00d2ed07767bad17f42cda
This commit is contained in:
Aleksandr Sorotskii
2024-11-27 14:36:24 +01:00
committed by intellij-monorepo-bot
parent 2769b5d234
commit 6727b2c5cf
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
python/src/com/jetbrains/python/sdk/uv/impl/UvLowLevel.kt
View File

@@ -4,6 +4,7 @@ package com.jetbrains.python.sdk.uv.impl
import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.fasterxml.jackson.module.kotlin.readValue
import com.intellij.util.io.delete
import com.jetbrains.python.packaging.common.PythonOutdatedPackage
import com.jetbrains.python.packaging.common.PythonPackage
import com.jetbrains.python.packaging.common.PythonPackageSpecification
@@ -11,25 +12,40 @@ import com.jetbrains.python.sdk.VirtualEnvReader
import com.jetbrains.python.sdk.uv.UvCli
import com.jetbrains.python.sdk.uv.UvLowLevel
import java.nio.file.Path
import kotlin.io.path.exists
import kotlin.io.path.pathString
internal class UvLowLevelImpl(val cwd: Path, val uvCli: UvCli) : UvLowLevel {
override suspend fun initializeEnvironment(init: Boolean, python: Path?): Result<Path> {
if (init) {
uvCli.runUv(cwd, "init").getOrElse {
return Result.failure(it)
}
}
var args = mutableListOf("venv");
if (python != null) {
val addPythonArg: (MutableList<String>) -> Unit = { args ->
python?.let {
args.add("--python")
args.add(python.pathString)
}
}
uvCli.runUv(cwd, *args.toTypedArray()).getOrElse {
if (init) {
val initArgs = mutableListOf("init")
addPythonArg(initArgs)
initArgs.add("--no-readme")
initArgs.add("--no-pin-python")
initArgs.add("--vcs")
initArgs.add("none")
uvCli.runUv(cwd, *initArgs.toTypedArray()).getOrElse {
return Result.failure(it)
}
}
val venvArgs = mutableListOf("venv");
addPythonArg(venvArgs)
uvCli.runUv(cwd, *venvArgs.toTypedArray()).getOrElse {
return Result.failure(it)
}
// TODO: ask for an uv option not to create
val hello = cwd.resolve("hello.py").takeIf { it.exists() }
hello?.delete()
val path = VirtualEnvReader.Instance.findPythonInPythonRoot(cwd.resolve(VirtualEnvReader.DEFAULT_VIRTUALENV_DIRNAME))
if (path == null) {