diff --git a/.idea/modules.xml b/.idea/modules.xml index 70166824f97f..b7f271a8cfe2 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -1444,7 +1444,6 @@ - @@ -1491,6 +1490,7 @@ + diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 930aa3241006..8c933ba6fe78 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -293,7 +293,7 @@ jvm_library( "//python/installer", "//platform/eel", "//platform/eel-provider", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "//python/python-exec-service:community-execService", "//python/services/system-python", "//python/services/internal-impl:python-community-services-internal-impl", @@ -557,8 +557,8 @@ jvm_library( "//python/junit5Tests-framework:community-junit5Tests-framework_test_lib", "//python/services/shared", "//python/services/shared:shared_test_lib", - "//python/python-venv:community-impl-venv", - "//python/python-venv:community-impl-venv_test_lib", + "//python/python-venv:venv", + "//python/python-venv:venv_test_lib", "//python/services/system-python", "//python/services/system-python:system-python_test_lib", "//python/interpreters", diff --git a/python/aliasProvider/BUILD.bazel b/python/aliasProvider/BUILD.bazel index 5c086e3de547..55e8e8e088b8 100644 --- a/python/aliasProvider/BUILD.bazel +++ b/python/aliasProvider/BUILD.bazel @@ -30,7 +30,7 @@ jvm_library( "//python/python-exec-service/execService.python", "//python/installer", "//python:python-pydev", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "//python/python-hatch:hatch", "//python/services/internal-impl:python-community-services-internal-impl", "//python/services/shared", diff --git a/python/aliasProvider/intellij.python.community.aliasProvider.iml b/python/aliasProvider/intellij.python.community.aliasProvider.iml index 1409ec44dcb6..03c4730cae58 100644 --- a/python/aliasProvider/intellij.python.community.aliasProvider.iml +++ b/python/aliasProvider/intellij.python.community.aliasProvider.iml @@ -24,7 +24,7 @@ - + diff --git a/python/aliasProvider/resources/intellij.python.community.aliasProvider.xml b/python/aliasProvider/resources/intellij.python.community.aliasProvider.xml index a0056a189ef7..97361bb8ef93 100644 --- a/python/aliasProvider/resources/intellij.python.community.aliasProvider.xml +++ b/python/aliasProvider/resources/intellij.python.community.aliasProvider.xml @@ -19,7 +19,7 @@ - + diff --git a/python/ide/impl/BUILD.bazel b/python/ide/impl/BUILD.bazel index 240769246125..bba794a53996 100644 --- a/python/ide/impl/BUILD.bazel +++ b/python/ide/impl/BUILD.bazel @@ -58,7 +58,7 @@ jvm_library( "//platform/eel-provider", "//python/services/shared", "//python/pipenv", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "@lib//:jetbrains-annotations", "//python/python-pyproject:pyproject", "//python/python-hatch:hatch", @@ -132,7 +132,7 @@ jvm_library( "//python/services/shared", "//python/services/shared:shared_test_lib", "//python/pipenv", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "@lib//:jetbrains-annotations", "//python/python-pyproject:pyproject", "//python/python-pyproject:pyproject_test_lib", diff --git a/python/ide/impl/intellij.pycharm.community.ide.impl.iml b/python/ide/impl/intellij.pycharm.community.ide.impl.iml index 4c9e9466157a..045862cfad6b 100644 --- a/python/ide/impl/intellij.pycharm.community.ide.impl.iml +++ b/python/ide/impl/intellij.pycharm.community.ide.impl.iml @@ -70,7 +70,7 @@ - + diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index 7f00f728b144..4c1427686bed 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -173,7 +173,7 @@ - + diff --git a/python/intellij.python.community.tests.iml b/python/intellij.python.community.tests.iml index 510603816c1a..e485f624ad90 100644 --- a/python/intellij.python.community.tests.iml +++ b/python/intellij.python.community.tests.iml @@ -107,7 +107,7 @@ - + diff --git a/python/interpreters/intellij.python.community.interpreters.iml b/python/interpreters/intellij.python.community.interpreters.iml index cffc5d82933c..87debd7927a2 100644 --- a/python/interpreters/intellij.python.community.interpreters.iml +++ b/python/interpreters/intellij.python.community.interpreters.iml @@ -29,7 +29,7 @@ - + diff --git a/python/pluginCore/plugin-content.yaml b/python/pluginCore/plugin-content.yaml index 08b894e06a25..58e23fcb516d 100644 --- a/python/pluginCore/plugin-content.yaml +++ b/python/pluginCore/plugin-content.yaml @@ -60,9 +60,6 @@ - name: lib/modules/intellij.python.community.impl.uv.common.jar contentModules: - name: intellij.python.community.impl.uv.common -- name: lib/modules/intellij.python.community.impl.venv.jar - contentModules: - - name: intellij.python.community.impl.venv - name: lib/modules/intellij.python.community.interpreters.jar contentModules: - name: intellij.python.community.interpreters @@ -181,6 +178,9 @@ - name: lib/modules/intellij.python.terminal.jar contentModules: - name: intellij.python.terminal +- name: lib/modules/intellij.python.venv.jar + contentModules: + - name: intellij.python.venv - name: lib/python-ce.jar modules: - name: intellij.python.community.plugin diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml index 158729c4b8c4..ffe7ccabf22b 100644 --- a/python/pluginCore/resources/META-INF/plugin.xml +++ b/python/pluginCore/resources/META-INF/plugin.xml @@ -51,7 +51,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of - + diff --git a/python/pluginResources/intellij.python.community.impl.xml b/python/pluginResources/intellij.python.community.impl.xml index f862c034c0ab..9ea8e99f276f 100644 --- a/python/pluginResources/intellij.python.community.impl.xml +++ b/python/pluginResources/intellij.python.community.impl.xml @@ -20,7 +20,7 @@ - + diff --git a/python/python-features-trainer/BUILD.bazel b/python/python-features-trainer/BUILD.bazel index 888d439860cf..491ff5cf06cc 100644 --- a/python/python-features-trainer/BUILD.bazel +++ b/python/python-features-trainer/BUILD.bazel @@ -84,8 +84,8 @@ jvm_library( "//python/junit5Tests-framework:community-junit5Tests-framework_test_lib", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", - "//python/python-venv:community-impl-venv", - "//python/python-venv:community-impl-venv_test_lib", + "//python/python-venv:venv", + "//python/python-venv:venv_test_lib", "//python/services/internal-impl:python-community-services-internal-impl", "//python/services/internal-impl:python-community-services-internal-impl_test_lib", "//python/pluginCore:community-plugin", diff --git a/python/python-features-trainer/intellij.python.featuresTrainer.iml b/python/python-features-trainer/intellij.python.featuresTrainer.iml index 7911fc4ef5f1..9f0163d61314 100644 --- a/python/python-features-trainer/intellij.python.featuresTrainer.iml +++ b/python/python-features-trainer/intellij.python.featuresTrainer.iml @@ -37,7 +37,7 @@ - + diff --git a/python/python-process-output/impl/testResources/intellij.python.processOutput.impl._test.xml b/python/python-process-output/impl/testResources/intellij.python.processOutput.impl._test.xml index 925f3e9c2039..61e95500e6db 100644 --- a/python/python-process-output/impl/testResources/intellij.python.processOutput.impl._test.xml +++ b/python/python-process-output/impl/testResources/intellij.python.processOutput.impl._test.xml @@ -1,7 +1,7 @@ - + diff --git a/python/python-terminal/BUILD.bazel b/python/python-terminal/BUILD.bazel index affb7a9aa872..77c06654dd32 100644 --- a/python/python-terminal/BUILD.bazel +++ b/python/python-terminal/BUILD.bazel @@ -55,8 +55,8 @@ jvm_library( "//python/testFramework", "//platform/eel-provider", "//libraries/hamcrest", - "//python/python-venv:community-impl-venv", - "//python/python-venv:community-impl-venv_test_lib", + "//python/python-venv:venv", + "//python/python-venv:venv_test_lib", "@lib//:junit5Params", "@lib//:junit5Pioneer", "//platform/testFramework/common", diff --git a/python/python-terminal/intellij.python.terminal.iml b/python/python-terminal/intellij.python.terminal.iml index a3a3bd9d83b7..e73e88fd96b1 100644 --- a/python/python-terminal/intellij.python.terminal.iml +++ b/python/python-terminal/intellij.python.terminal.iml @@ -25,7 +25,7 @@ - + diff --git a/python/python-terminal/testResources/intellij.python.terminal._test.xml b/python/python-terminal/testResources/intellij.python.terminal._test.xml index 6c93f5661378..0be8dd5a0e8f 100644 --- a/python/python-terminal/testResources/intellij.python.terminal._test.xml +++ b/python/python-terminal/testResources/intellij.python.terminal._test.xml @@ -1,7 +1,7 @@ - + diff --git a/python/python-test-env/junit5/BUILD.bazel b/python/python-test-env/junit5/BUILD.bazel index f8c29dae6d3b..c7036b5a9d4c 100644 --- a/python/python-test-env/junit5/BUILD.bazel +++ b/python/python-test-env/junit5/BUILD.bazel @@ -56,8 +56,8 @@ jvm_library( "//python:python-community-impl_test_lib", "//platform/execution", "//python/python-test-env/conda:conda_test_lib", - "//python/python-venv:community-impl-venv", - "//python/python-venv:community-impl-venv_test_lib", + "//python/python-venv:venv", + "//python/python-venv:venv_test_lib", "//python/testFramework", "//libraries/junit5", "//platform/testFramework/common", diff --git a/python/python-test-env/junit5/intellij.python.test.env.junit5.iml b/python/python-test-env/junit5/intellij.python.test.env.junit5.iml index 12da561abbfb..0b3639d3177b 100644 --- a/python/python-test-env/junit5/intellij.python.test.env.junit5.iml +++ b/python/python-test-env/junit5/intellij.python.test.env.junit5.iml @@ -27,7 +27,7 @@ - + diff --git a/python/python-test-env/junit5/src/com/intellij/python/test/env/junit5/pyVenvFixture.kt b/python/python-test-env/junit5/src/com/intellij/python/test/env/junit5/pyVenvFixture.kt index 769bf3dde68e..d139899140b6 100644 --- a/python/python-test-env/junit5/src/com/intellij/python/test/env/junit5/pyVenvFixture.kt +++ b/python/python-test-env/junit5/src/com/intellij/python/test/env/junit5/pyVenvFixture.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.application.edtWriteAction import com.intellij.openapi.module.Module import com.intellij.openapi.projectRoots.ProjectJdkTable import com.intellij.openapi.projectRoots.Sdk -import com.intellij.python.community.impl.venv.createVenv +import com.intellij.python.venv.createVenv import com.intellij.python.junit5Tests.framework.env.SdkFixture import com.intellij.python.test.env.core.PyEnvironment import com.intellij.testFramework.junit5.fixture.TestFixture diff --git a/python/python-test-env/junit5/test/com/intellij/python/test/env/junit5/conda/showcase/RunOnEnvironmentsShowCaseTest.kt b/python/python-test-env/junit5/test/com/intellij/python/test/env/junit5/conda/showcase/RunOnEnvironmentsShowCaseTest.kt index ff4340aba01c..2e9b723d3375 100644 --- a/python/python-test-env/junit5/test/com/intellij/python/test/env/junit5/conda/showcase/RunOnEnvironmentsShowCaseTest.kt +++ b/python/python-test-env/junit5/test/com/intellij/python/test/env/junit5/conda/showcase/RunOnEnvironmentsShowCaseTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.python.test.env.junit5.conda.showcase -import com.intellij.python.community.impl.venv.createVenv +import com.intellij.python.venv.createVenv import com.intellij.python.junit5Tests.framework.env.BeforeRunOnEnvironmentInvocation import com.intellij.python.junit5Tests.framework.env.PyEnvTestCase import com.intellij.python.junit5Tests.framework.env.PythonBinaryPath diff --git a/python/python-test-env/plain/BUILD.bazel b/python/python-test-env/plain/BUILD.bazel index ed4ba84cba2d..23cdce5c3dfd 100644 --- a/python/python-test-env/plain/BUILD.bazel +++ b/python/python-test-env/plain/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( "@lib//:jetbrains-annotations", "//python/python-test-env/core", "//python/openapi:community", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "//platform/core-api:core", "//platform/projectModel-api:projectModel", "//python/python-sdk:sdk", @@ -41,7 +41,7 @@ jvm_library( "//python/python-test-env/core:core_test_lib", "//python/openapi:community", "//python/openapi:community_test_lib", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "//platform/core-api:core", "//platform/projectModel-api:projectModel", "//python/python-sdk:sdk", diff --git a/python/python-test-env/plain/intellij.python.test.env.plain.iml b/python/python-test-env/plain/intellij.python.test.env.plain.iml index 59af5314caa9..9c453c22843f 100644 --- a/python/python-test-env/plain/intellij.python.test.env.plain.iml +++ b/python/python-test-env/plain/intellij.python.test.env.plain.iml @@ -11,7 +11,7 @@ - + diff --git a/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml b/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml index 1a2d86c2b9cc..a1438a387c59 100644 --- a/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml +++ b/python/python-test-env/plain/resources/intellij.python.test.env.plain.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/python/python-test-env/plain/src/com/intellij/python/test/env/plain/VirtualenvPyEnvironmentProvider.kt b/python/python-test-env/plain/src/com/intellij/python/test/env/plain/VirtualenvPyEnvironmentProvider.kt index 23661720f951..ea268ce5f78c 100644 --- a/python/python-test-env/plain/src/com/intellij/python/test/env/plain/VirtualenvPyEnvironmentProvider.kt +++ b/python/python-test-env/plain/src/com/intellij/python/test/env/plain/VirtualenvPyEnvironmentProvider.kt @@ -3,7 +3,7 @@ package com.intellij.python.test.env.plain import com.intellij.openapi.diagnostic.thisLogger import com.intellij.python.community.execService.asBinToExec -import com.intellij.python.community.impl.venv.createVenv +import com.intellij.python.venv.createVenv import com.intellij.python.test.env.core.PyEnvironment import com.intellij.python.test.env.core.PyEnvironmentProvider import com.intellij.python.test.env.core.installPipPackages diff --git a/python/python-venv/BUILD.bazel b/python/python-venv/BUILD.bazel index 934b74b0d252..d41dc74b93ab 100644 --- a/python/python-venv/BUILD.bazel +++ b/python/python-venv/BUILD.bazel @@ -1,24 +1,24 @@ -### auto-generated section `build intellij.python.community.impl.venv` start +### auto-generated section `build intellij.python.venv` start load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") resourcegroup( - name = "community-impl-venv_resources", + name = "venv_resources", srcs = glob(["resources/**/*"]), strip_prefix = "resources" ) resourcegroup( - name = "community-impl-venv_test_resources", + name = "venv_test_resources", srcs = glob(["testResources/**/*"]), strip_prefix = "testResources" ) jvm_library( - name = "community-impl-venv", - module_name = "intellij.python.community.impl.venv", + name = "venv", + module_name = "intellij.python.venv", visibility = ["//visibility:public"], - srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form"], allow_empty = True), - resources = [":community-impl-venv_resources"], + srcs = glob(["src/**/*.kt", "src/**/*.java", "src/**/*.form", "gen/**/*.kt", "gen/**/*.java"], allow_empty = True), + resources = [":venv_resources"], deps = [ "@lib//:kotlin-stdlib", "@lib//:jetbrains-annotations", @@ -36,13 +36,13 @@ jvm_library( ) jvm_library( - name = "community-impl-venv_test_lib", - module_name = "intellij.python.community.impl.venv", + name = "venv_test_lib", + module_name = "intellij.python.venv", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - resources = [":community-impl-venv_test_resources"], + resources = [":venv_test_resources"], runtime_deps = [ - ":community-impl-venv", + ":venv", "//python/openapi:community_test_lib", "//python/python-exec-service:community-execService_test_lib", "//python/python-sdk:sdk_test_lib", @@ -58,4 +58,4 @@ jvm_library( "//python/testFramework", ] ) -### auto-generated section `build intellij.python.community.impl.venv` end \ No newline at end of file +### auto-generated section `build intellij.python.venv` end \ No newline at end of file diff --git a/python/python-venv/gen/com/intellij/python/venv/icons/PythonVenvIcons.java b/python/python-venv/gen/com/intellij/python/venv/icons/PythonVenvIcons.java new file mode 100644 index 000000000000..91b892f8a670 --- /dev/null +++ b/python/python-venv/gen/com/intellij/python/venv/icons/PythonVenvIcons.java @@ -0,0 +1,18 @@ +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +package com.intellij.python.venv.icons; + +import com.intellij.ui.IconManager; +import org.jetbrains.annotations.NotNull; + +import javax.swing.*; + +/** + * NOTE THIS FILE IS AUTO-GENERATED + * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead + */ +public final class PythonVenvIcons { + private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { + return IconManager.getInstance().loadRasterizedIcon(path, PythonVenvIcons.class.getClassLoader(), cacheKey, flags); + } + /** 16x16 */ public static final @NotNull Icon VirtualEnv = load("icons/com/intellij/python/venv/expui/virtualEnv.svg", -2086316895, 2); +} diff --git a/python/python-venv/intellij.python.community.impl.venv.iml b/python/python-venv/intellij.python.venv.iml similarity index 96% rename from python/python-venv/intellij.python.community.impl.venv.iml rename to python/python-venv/intellij.python.venv.iml index 384f10dbb384..14fe68855351 100644 --- a/python/python-venv/intellij.python.community.impl.venv.iml +++ b/python/python-venv/intellij.python.venv.iml @@ -6,6 +6,7 @@ + diff --git a/python/python-venv/resources/PythonVenvIconMappings.json b/python/python-venv/resources/PythonVenvIconMappings.json deleted file mode 100644 index 410846550771..000000000000 --- a/python/python-venv/resources/PythonVenvIconMappings.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "images": { - "intellij": { - "python": { - "community": { - "impl": { - "venv": { - "expui": { - "virtualEnv.svg": "images/intellij/python/community/impl/venv/virtualenv.svg" - } - } - } - } - } - } - } -} \ No newline at end of file diff --git a/python/python-venv/resources/images/intellij/python/community/impl/venv/expui/virtualEnv.svg b/python/python-venv/resources/icons/com/intellij/python/venv/expui/virtualEnv.svg similarity index 100% rename from python/python-venv/resources/images/intellij/python/community/impl/venv/expui/virtualEnv.svg rename to python/python-venv/resources/icons/com/intellij/python/venv/expui/virtualEnv.svg diff --git a/python/python-venv/resources/images/intellij/python/community/impl/venv/expui/virtualEnv_dark.svg b/python/python-venv/resources/icons/com/intellij/python/venv/expui/virtualEnv_dark.svg similarity index 100% rename from python/python-venv/resources/images/intellij/python/community/impl/venv/expui/virtualEnv_dark.svg rename to python/python-venv/resources/icons/com/intellij/python/venv/expui/virtualEnv_dark.svg diff --git a/python/python-venv/resources/images/intellij/python/community/impl/venv/expui/icon-robots.txt b/python/python-venv/resources/images/intellij/python/community/impl/venv/expui/icon-robots.txt deleted file mode 100644 index 53c8664db3f1..000000000000 --- a/python/python-venv/resources/images/intellij/python/community/impl/venv/expui/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -merge \ No newline at end of file diff --git a/python/python-venv/resources/images/intellij/python/community/impl/venv/virtualenv.svg b/python/python-venv/resources/images/intellij/python/community/impl/venv/virtualenv.svg deleted file mode 100644 index b8d8269dea02..000000000000 --- a/python/python-venv/resources/images/intellij/python/community/impl/venv/virtualenv.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/python/python-venv/resources/intellij.python.community.impl.venv.xml b/python/python-venv/resources/intellij.python.venv.xml similarity index 80% rename from python/python-venv/resources/intellij.python.community.impl.venv.xml rename to python/python-venv/resources/intellij.python.venv.xml index c750ce92b995..d89788f76a90 100644 --- a/python/python-venv/resources/intellij.python.community.impl.venv.xml +++ b/python/python-venv/resources/intellij.python.venv.xml @@ -8,7 +8,6 @@ - - + \ No newline at end of file diff --git a/python/python-venv/src/com/intellij/python/community/impl/venv/icons/PythonCommunityImplVenvIcons.java b/python/python-venv/src/com/intellij/python/community/impl/venv/icons/PythonCommunityImplVenvIcons.java deleted file mode 100644 index de9fb02bd086..000000000000 --- a/python/python-venv/src/com/intellij/python/community/impl/venv/icons/PythonCommunityImplVenvIcons.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.python.community.impl.venv.icons; - -import com.intellij.ui.IconManager; -import org.jetbrains.annotations.NotNull; - -import javax.swing.*; - -/** - * NOTE THIS FILE IS AUTO-GENERATED - * DO NOT EDIT IT BY HAND, run "Generate icon classes" configuration instead - */ -@org.jetbrains.annotations.ApiStatus.Internal -public final class PythonCommunityImplVenvIcons { - private static @NotNull Icon load(@NotNull String expUIPath, @NotNull String path, int cacheKey, int flags) { - return IconManager.getInstance().loadRasterizedIcon(path, expUIPath, PythonCommunityImplVenvIcons.class.getClassLoader(), cacheKey, flags); - } - /** 16x16 */ public static final @NotNull Icon Virtualenv = load("images/intellij/python/community/impl/venv/expui/virtualEnv.svg", "images/intellij/python/community/impl/venv/virtualenv.svg", 758230626, 0); -} diff --git a/python/python-venv/src/com/intellij/python/community/impl/venv/PyReqToolIdToIconMapper.kt b/python/python-venv/src/com/intellij/python/venv/PyReqToolIdToIconMapper.kt similarity index 57% rename from python/python-venv/src/com/intellij/python/community/impl/venv/PyReqToolIdToIconMapper.kt rename to python/python-venv/src/com/intellij/python/venv/PyReqToolIdToIconMapper.kt index 9c5f1a9337b2..f5cfc5a20244 100644 --- a/python/python-venv/src/com/intellij/python/community/impl/venv/PyReqToolIdToIconMapper.kt +++ b/python/python-venv/src/com/intellij/python/venv/PyReqToolIdToIconMapper.kt @@ -1,13 +1,13 @@ // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.python.community.impl.venv +package com.intellij.python.venv import com.intellij.python.common.tools.ToolId import com.intellij.python.common.tools.spi.ToolIdToIconMapper -import com.intellij.python.community.impl.venv.icons.PythonCommunityImplVenvIcons +import com.intellij.python.venv.icons.PythonVenvIcons import javax.swing.Icon internal class PyReqToolIdToIconMapper : ToolIdToIconMapper { override val id: ToolId = PY_REQ_TOOL_ID - override val icon: Icon = PythonCommunityImplVenvIcons.Virtualenv - override val clazz: Class<*> = PythonCommunityImplVenvIcons::class.java + override val icon: Icon = PythonVenvIcons.VirtualEnv + override val clazz: Class<*> = PythonVenvIcons::class.java } \ No newline at end of file diff --git a/python/python-venv/src/com/intellij/python/community/impl/venv/PyVenvBundle.kt b/python/python-venv/src/com/intellij/python/venv/PyVenvBundle.kt similarity index 94% rename from python/python-venv/src/com/intellij/python/community/impl/venv/PyVenvBundle.kt rename to python/python-venv/src/com/intellij/python/venv/PyVenvBundle.kt index 3a8f7bb70b7b..5cae013819f3 100644 --- a/python/python-venv/src/com/intellij/python/community/impl/venv/PyVenvBundle.kt +++ b/python/python-venv/src/com/intellij/python/venv/PyVenvBundle.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.python.community.impl.venv +package com.intellij.python.venv import com.intellij.DynamicBundle import org.jetbrains.annotations.Nls diff --git a/python/python-venv/src/com/intellij/python/community/impl/venv/package-info.java b/python/python-venv/src/com/intellij/python/venv/package-info.java similarity index 51% rename from python/python-venv/src/com/intellij/python/community/impl/venv/package-info.java rename to python/python-venv/src/com/intellij/python/venv/package-info.java index e3b715a928df..e9348cc23fc4 100644 --- a/python/python-venv/src/com/intellij/python/community/impl/venv/package-info.java +++ b/python/python-venv/src/com/intellij/python/venv/package-info.java @@ -1,5 +1,5 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. @ApiStatus.Internal -package com.intellij.python.community.impl.venv; +package com.intellij.python.venv; import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/python/python-venv/src/com/intellij/python/community/impl/venv/venv.kt b/python/python-venv/src/com/intellij/python/venv/venv.kt similarity index 98% rename from python/python-venv/src/com/intellij/python/community/impl/venv/venv.kt rename to python/python-venv/src/com/intellij/python/venv/venv.kt index a9b8b3794a6f..eba13e09b125 100644 --- a/python/python-venv/src/com/intellij/python/community/impl/venv/venv.kt +++ b/python/python-venv/src/com/intellij/python/venv/venv.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.python.community.impl.venv +package com.intellij.python.venv import com.intellij.openapi.application.EDT import com.intellij.openapi.diagnostic.fileLogger diff --git a/python/python-venv/src/com/intellij/python/community/impl/venv/venvId.kt b/python/python-venv/src/com/intellij/python/venv/venvId.kt similarity index 85% rename from python/python-venv/src/com/intellij/python/community/impl/venv/venvId.kt rename to python/python-venv/src/com/intellij/python/venv/venvId.kt index c54bbf931626..519754e2437d 100644 --- a/python/python-venv/src/com/intellij/python/community/impl/venv/venvId.kt +++ b/python/python-venv/src/com/intellij/python/venv/venvId.kt @@ -1,5 +1,5 @@ // Copyright 2000-2026 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.python.community.impl.venv +package com.intellij.python.venv import com.intellij.python.common.tools.ToolId import org.jetbrains.annotations.ApiStatus diff --git a/python/python-venv/testResources/intellij.python.community.impl.venv._test.xml b/python/python-venv/testResources/intellij.python.venv._test.xml similarity index 100% rename from python/python-venv/testResources/intellij.python.community.impl.venv._test.xml rename to python/python-venv/testResources/intellij.python.venv._test.xml diff --git a/python/services/system-python/BUILD.bazel b/python/services/system-python/BUILD.bazel index f4180e3f1ea5..a4d8f1c4978e 100644 --- a/python/services/system-python/BUILD.bazel +++ b/python/services/system-python/BUILD.bazel @@ -33,7 +33,7 @@ jvm_library( "//python/services/internal-impl:python-community-services-internal-impl", "//platform/util", "//python/installer", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "//python/python-psi-impl:psi-impl", "//python/python-exec-service/execService.python", ], @@ -70,7 +70,7 @@ jvm_library( "//platform/util", "//python/junit5Tests-framework:community-junit5Tests-framework_test_lib", "//python/installer", - "//python/python-venv:community-impl-venv", + "//python/python-venv:venv", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", "//python/python-psi-impl:psi-impl", diff --git a/python/services/system-python/intellij.python.community.services.systemPython.iml b/python/services/system-python/intellij.python.community.services.systemPython.iml index 9b7835f68488..572f3c2302a1 100644 --- a/python/services/system-python/intellij.python.community.services.systemPython.iml +++ b/python/services/system-python/intellij.python.community.services.systemPython.iml @@ -29,7 +29,7 @@ - + diff --git a/python/services/system-python/resources/intellij.python.community.services.systemPython.xml b/python/services/system-python/resources/intellij.python.community.services.systemPython.xml index 9c987fbba4d5..dcfcff144174 100644 --- a/python/services/system-python/resources/intellij.python.community.services.systemPython.xml +++ b/python/services/system-python/resources/intellij.python.community.services.systemPython.xml @@ -4,7 +4,7 @@ - + diff --git a/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt b/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt index 5d8e2cf599af..198e72d68daf 100644 --- a/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt +++ b/python/services/system-python/src/com/intellij/python/community/services/systemPython/api.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.service import com.intellij.platform.eel.EelApi import com.intellij.platform.eel.provider.localEel -import com.intellij.python.community.impl.venv.createVenv +import com.intellij.python.venv.createVenv import com.intellij.python.community.services.shared.PythonInfoWithUiComparator import com.intellij.python.community.services.shared.PythonWithUi import com.intellij.python.community.services.shared.VanillaPythonWithPythonInfo diff --git a/python/src/com/jetbrains/python/PythonHelper.java b/python/src/com/jetbrains/python/PythonHelper.java index 781b8218a80a..54ed55624d19 100644 --- a/python/src/com/jetbrains/python/PythonHelper.java +++ b/python/src/com/jetbrains/python/PythonHelper.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.stream.Collectors; import static com.intellij.python.community.helpersLocator.PythonHelpersLocator.*; -import static com.intellij.python.community.impl.venv.VenvKt.LEGACY_VIRTUALENV_ZIPAPP_NAME; -import static com.intellij.python.community.impl.venv.VenvKt.VIRTUALENV_ZIPAPP_NAME; +import static com.intellij.python.venv.VenvKt.LEGACY_VIRTUALENV_ZIPAPP_NAME; +import static com.intellij.python.venv.VenvKt.VIRTUALENV_ZIPAPP_NAME; import static com.jetbrains.python.packaging.pip.PipPackageManagerEngine.PACKAGING_TOOL_NAME; public enum PythonHelper implements HelperPackage { diff --git a/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt b/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt index 98bfbe363b7c..5411399113ac 100644 --- a/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt +++ b/python/src/com/jetbrains/python/projectCreation/venvWithSdkCreator.kt @@ -16,7 +16,7 @@ import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VirtualFile import com.intellij.platform.util.progress.withProgressText import com.intellij.python.community.execService.python.validatePythonAndGetInfo -import com.intellij.python.community.impl.venv.createVenv +import com.intellij.python.venv.createVenv import com.intellij.python.community.services.systemPython.SystemPython import com.intellij.python.community.services.systemPython.SystemPythonService import com.intellij.python.community.services.systemPython.createVenvFromSystemPython diff --git a/python/src/com/jetbrains/python/sdk/add/v2/common.kt b/python/src/com/jetbrains/python/sdk/add/v2/common.kt index c319421493b0..ca0cc5532c3d 100644 --- a/python/src/com/jetbrains/python/sdk/add/v2/common.kt +++ b/python/src/com/jetbrains/python/sdk/add/v2/common.kt @@ -35,9 +35,9 @@ import com.intellij.python.community.impl.poetry.common.POETRY_TOOL_ID import com.intellij.python.community.impl.poetry.common.icons.PythonCommunityImplPoetryCommonIcons import com.intellij.python.community.impl.uv.common.UV_TOOL_ID import com.intellij.python.community.impl.uv.common.icons.PythonCommunityImplUVCommonIcons -import com.intellij.python.community.impl.venv.icons.PythonCommunityImplVenvIcons import com.intellij.python.hatch.icons.PythonHatchIcons import com.intellij.python.hatch.impl.HATCH_TOOL_ID +import com.intellij.python.venv.icons.PythonVenvIcons import com.intellij.ui.dsl.builder.Align import com.intellij.ui.dsl.builder.Panel import com.intellij.ui.dsl.builder.Row @@ -167,7 +167,7 @@ enum class PythonSupportedEnvironmentManagers( val icon: Icon, val isFSSupported: (FileSystem<*>) -> Boolean = { (it as? FileSystem.Eel)?.eelApi == localEel }, ) { - VIRTUALENV(VENV_TOOL_ID, "sdk.create.custom.virtualenv", PythonCommunityImplVenvIcons.Virtualenv, { true }), + VIRTUALENV(VENV_TOOL_ID, "sdk.create.custom.virtualenv", PythonVenvIcons.VirtualEnv, { true }), CONDA(CONDA_TOOL_ID, "sdk.create.custom.conda", PythonIcons.Python.Anaconda, { true }), POETRY(POETRY_TOOL_ID, "sdk.create.custom.poetry", PythonCommunityImplPoetryCommonIcons.Poetry), PIPENV(PIPENV_TOOL_ID, "sdk.create.custom.pipenv", PIPENV_ICON), diff --git a/python/src/com/jetbrains/python/sdk/add/v2/venv/helper.kt b/python/src/com/jetbrains/python/sdk/add/v2/venv/helper.kt index 09f486e9f6d6..3d8fe27d8513 100644 --- a/python/src/com/jetbrains/python/sdk/add/v2/venv/helper.kt +++ b/python/src/com/jetbrains/python/sdk/add/v2/venv/helper.kt @@ -2,7 +2,7 @@ package com.jetbrains.python.sdk.add.v2.venv import com.intellij.openapi.projectRoots.Sdk -import com.intellij.python.community.impl.venv.createVenv +import com.intellij.python.venv.createVenv import com.jetbrains.python.PyBundle.message import com.jetbrains.python.errorProcessing.PyResult import com.jetbrains.python.errorProcessing.getOr diff --git a/python/src/com/jetbrains/python/sdk/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt b/python/src/com/jetbrains/python/sdk/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt index 8495f1c16b5b..46fc908b3fed 100644 --- a/python/src/com/jetbrains/python/sdk/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt +++ b/python/src/com/jetbrains/python/sdk/configuration/PyRequirementsTxtOrSetupPySdkConfiguration.kt @@ -5,7 +5,7 @@ import com.intellij.openapi.diagnostic.thisLogger import com.intellij.openapi.module.Module import com.intellij.openapi.projectRoots.Sdk import com.intellij.python.common.tools.ToolId -import com.intellij.python.community.impl.venv.PY_REQ_TOOL_ID +import com.intellij.python.venv.PY_REQ_TOOL_ID import com.jetbrains.python.PyBundle import com.jetbrains.python.PythonBinary import com.jetbrains.python.errorProcessing.PyResult diff --git a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java index 3db759ac7be2..ea9ef9a36a6d 100644 --- a/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java +++ b/python/src/com/jetbrains/python/sdk/flavors/VirtualEnvSdkFlavor.java @@ -6,7 +6,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.python.community.impl.venv.icons.PythonCommunityImplVenvIcons; +import com.intellij.python.venv.icons.PythonVenvIcons; import com.intellij.util.concurrency.annotations.RequiresBackgroundThread; import com.intellij.util.containers.ContainerUtil; import com.jetbrains.python.sdk.BasePySdkExtKt; @@ -85,6 +85,6 @@ public final class VirtualEnvSdkFlavor extends CPythonSdkFlavor