From e055030ced2da9c95731118356e5bf9c9bdb384d Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Tue, 22 Apr 2025 23:57:09 +0200 Subject: [PATCH] PY-65425: Save SDK->Module assoc. to make SDK module-specific. Wrong function was used: one must use either sdk modification or special helper function that commits the model. GitOrigin-RevId: 343e536a195170654ddfef7de42f505806405c9e --- .../env/venv/showCase/PyEnvWithVenvShowCaseTest.kt | 2 +- .../jetbrains/python/projectCreation/venvWithSdkCreator.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/python-venv/tests/com/intellij/python/junit5Tests/env/venv/showCase/PyEnvWithVenvShowCaseTest.kt b/python/python-venv/tests/com/intellij/python/junit5Tests/env/venv/showCase/PyEnvWithVenvShowCaseTest.kt index 857939781435..3737024304ef 100644 --- a/python/python-venv/tests/com/intellij/python/junit5Tests/env/venv/showCase/PyEnvWithVenvShowCaseTest.kt +++ b/python/python-venv/tests/com/intellij/python/junit5Tests/env/venv/showCase/PyEnvWithVenvShowCaseTest.kt @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test @PyEnvTestCase class PyEnvWithVenvShowCaseTest { private val tempPathFixture = tempPathFixture() - private val moduleFixture = projectFixture().moduleFixture() + private val moduleFixture = projectFixture().moduleFixture(tempPathFixture, addPathToSourceRoot = true) private val venvFixture = pySdkFixture().pyVenvFixture( // <-- venv fixture where = tempPathFixture, addToSdkTable = true, diff --git a/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt b/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt index 2a75fb16f92d..4a15d828c1a5 100644 --- a/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt +++ b/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt @@ -21,8 +21,8 @@ import com.jetbrains.python.errorProcessing.failure import com.jetbrains.python.sdk.configurePythonSdk import com.jetbrains.python.sdk.createSdk import com.jetbrains.python.sdk.flavors.PythonSdkFlavor -import com.jetbrains.python.sdk.getOrCreateAdditionalData import com.jetbrains.python.sdk.pythonSdk +import com.jetbrains.python.sdk.setAssociationToModuleAsync import com.jetbrains.python.venvReader.VirtualEnvReader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -86,7 +86,7 @@ suspend fun createVenvAndSdk( VfsUtil.markDirtyAndRefresh(false, true, true, vfsProjectPath) } configurePythonSdk(project, module, sdk) - sdk.getOrCreateAdditionalData().associateWithModule(module) + sdk.setAssociationToModuleAsync(module) module.pythonSdk return Result.success(sdk) }