mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
PY-87232 Change venv module name
GitOrigin-RevId: faf2719abc6236f93840f7a2e34e58eec9f6e868
This commit is contained in:
committed by
intellij-monorepo-bot
parent
1c737661f5
commit
9ebdd29d37
Generated
+1
-1
@@ -1444,7 +1444,6 @@
|
||||
<module fileurl="file://$PROJECT_DIR$/python/python-poetry/common/intellij.python.community.impl.poetry.common.iml" filepath="$PROJECT_DIR$/python/python-poetry/common/intellij.python.community.impl.poetry.common.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/python-uv/backend/intellij.python.community.impl.uv.backend.iml" filepath="$PROJECT_DIR$/python/python-uv/backend/intellij.python.community.impl.uv.backend.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/python-uv/common/intellij.python.community.impl.uv.common.iml" filepath="$PROJECT_DIR$/python/python-uv/common/intellij.python.community.impl.uv.common.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/python-venv/intellij.python.community.impl.venv.iml" filepath="$PROJECT_DIR$/python/python-venv/intellij.python.community.impl.venv.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/interpreters/intellij.python.community.interpreters.iml" filepath="$PROJECT_DIR$/python/interpreters/intellij.python.community.interpreters.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml" filepath="$PROJECT_DIR$/python/junit5Tests-framework/intellij.python.community.junit5Tests.framework.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" filepath="$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" />
|
||||
@@ -1491,6 +1490,7 @@
|
||||
<module fileurl="file://$PROJECT_DIR$/python/python-test-env/plain/intellij.python.test.env.plain.iml" filepath="$PROJECT_DIR$/python/python-test-env/plain/intellij.python.test.env.plain.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/python-test-env/uv/intellij.python.test.env.uv.iml" filepath="$PROJECT_DIR$/python/python-test-env/uv/intellij.python.test.env.uv.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/tools/intellij.python.tools.iml" filepath="$PROJECT_DIR$/python/tools/intellij.python.tools.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/python/python-venv/intellij.python.venv.iml" filepath="$PROJECT_DIR$/python/python-venv/intellij.python.venv.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/RegExpSupport/intellij.regexp.iml" filepath="$PROJECT_DIR$/RegExpSupport/intellij.regexp.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/xml/relaxng/intellij.relaxng.iml" filepath="$PROJECT_DIR$/xml/relaxng/intellij.relaxng.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/plugins/remote-control/intellij.remoteControl.iml" filepath="$PROJECT_DIR$/plugins/remote-control/intellij.remoteControl.iml" />
|
||||
|
||||
+3
-3
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<orderEntry type="module" module-name="intellij.python.community.execService.python" scope="RUNTIME" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.installer" scope="RUNTIME" />
|
||||
<orderEntry type="module" module-name="intellij.python.pydev" scope="RUNTIME" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="RUNTIME" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" scope="RUNTIME" />
|
||||
<orderEntry type="module" module-name="intellij.python.hatch" scope="RUNTIME" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.internal.impl" scope="RUNTIME" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.shared" scope="RUNTIME" />
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<module name="intellij.python.community.execService.python"/>
|
||||
<module name="intellij.python.community.impl.installer"/>
|
||||
<module name="intellij.python.pydev"/>
|
||||
<module name="intellij.python.community.impl.venv"/>
|
||||
<module name="intellij.python.venv"/>
|
||||
<module name="intellij.python.hatch"/>
|
||||
<module name="intellij.python.community.services.shared"/>
|
||||
<module name="intellij.python.community.services.internal.impl"/>
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.eel.provider" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.shared" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.pipenv" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" />
|
||||
<orderEntry type="library" name="jetbrains-annotations" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.python.pyproject" />
|
||||
<orderEntry type="module" module-name="intellij.python.hatch" />
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.installer" />
|
||||
<orderEntry type="module" module-name="intellij.platform.eel" />
|
||||
<orderEntry type="module" module-name="intellij.platform.eel.provider" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.execService" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.systemPython" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.internal.impl" />
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.internal.impl" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.junit5Tests.framework" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.shared" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.systemPython" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.interpreters" scope="TEST" />
|
||||
</component>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.platform.lang.core" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.plugin" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.helpersLocator" scope="TEST" />
|
||||
</component>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -51,7 +51,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of
|
||||
<module name="intellij.python.community.execService.python" loading="required"/>
|
||||
<module name="intellij.python.community.impl.installer" loading="required"/>
|
||||
<module name="intellij.python.pydev" loading="required"/>
|
||||
<module name="intellij.python.community.impl.venv" loading="required"/>
|
||||
<module name="intellij.python.venv" loading="required"/>
|
||||
<module name="intellij.python.hatch" loading="required"/>
|
||||
<module name="intellij.python.community.services.shared" loading="required"/>
|
||||
<module name="intellij.python.community.services.internal.impl" loading="required"/>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<module name="intellij.libraries.kotlinx.io"/>
|
||||
<module name="intellij.python.pyproject"/>
|
||||
<module name="intellij.python.community.impl.installer"/>
|
||||
<module name="intellij.python.community.impl.venv"/>
|
||||
<module name="intellij.python.venv"/>
|
||||
<module name="intellij.python.community.services.systemPython"/>
|
||||
<module name="intellij.python.sdkConfigurator.common"/>
|
||||
<module name="intellij.python.processOutput"/>
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.systemPython" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.junit5Tests.framework" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.services.internal.impl" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.plugin" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.libraries.stream" />
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
<idea-plugin>
|
||||
<dependencies>
|
||||
<module name="intellij.python.processOutput.impl"/>
|
||||
<module name="intellij.python.community.impl.venv._test"/>
|
||||
<module name="intellij.python.venv._test"/>
|
||||
<module name="intellij.python.community.junit5Tests.framework._test"/>
|
||||
<module name="intellij.python.test.env.junit5"/>
|
||||
<!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<orderEntry type="module" module-name="intellij.python.community.testFramework" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.libraries.hamcrest" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" scope="TEST" />
|
||||
<orderEntry type="library" scope="TEST" name="JUnit5Params" level="project" />
|
||||
<orderEntry type="library" scope="TEST" name="JUnit5Pioneer" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.platform.testFramework.common" scope="TEST" />
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<idea-plugin>
|
||||
<dependencies>
|
||||
<module name="intellij.libraries.junit5.pioneer"/>
|
||||
<module name="intellij.python.community.impl.venv._test"/>
|
||||
<module name="intellij.python.venv._test"/>
|
||||
<module name="intellij.python.terminal"/>
|
||||
<module name="intellij.python.test.env.junit5"/>
|
||||
</dependencies>
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.platform.execution" />
|
||||
<orderEntry type="module" module-name="intellij.python.test.env.conda" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.testFramework" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.libraries.junit5" />
|
||||
<orderEntry type="module" module-name="intellij.platform.testFramework.common" scope="TEST" />
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
<orderEntry type="library" name="jetbrains-annotations" level="project" />
|
||||
<orderEntry type="module" module-name="intellij.python.test.env.core" />
|
||||
<orderEntry type="module" module-name="intellij.python.community" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" />
|
||||
<orderEntry type="module" module-name="intellij.platform.core" />
|
||||
<orderEntry type="module" module-name="intellij.platform.projectModel" />
|
||||
<orderEntry type="module" module-name="intellij.python.sdk" />
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<idea-plugin>
|
||||
<dependencies>
|
||||
<module name="intellij.python.test.env.core"/>
|
||||
<module name="intellij.python.community.impl.venv"/>
|
||||
<module name="intellij.python.venv"/>
|
||||
</dependencies>
|
||||
</idea-plugin>
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
### auto-generated section `build intellij.python.venv` end
|
||||
@@ -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);
|
||||
}
|
||||
+1
@@ -6,6 +6,7 @@
|
||||
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
|
||||
</content>
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
@@ -1,17 +0,0 @@
|
||||
{
|
||||
"images": {
|
||||
"intellij": {
|
||||
"python": {
|
||||
"community": {
|
||||
"impl": {
|
||||
"venv": {
|
||||
"expui": {
|
||||
"virtualEnv.svg": "images/intellij/python/community/impl/venv/virtualenv.svg"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
-1
@@ -1 +0,0 @@
|
||||
merge
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
|
||||
<g fill="none" fill-rule="evenodd">
|
||||
<g fill-opacity=".9" fill-rule="nonzero" transform="translate(1 1)">
|
||||
<path fill="#40A0CF" d="M6.91022782,0.0258929487 C6.37000109,0.0264652608 5.83075904,0.0719962659 5.2980847,0.162014559 C3.87043029,0.411472936 3.61125094,0.933622118 3.61125094,1.89655803 L3.61125094,3.1683132 L6.98491847,3.1683132 L6.98491847,3.5922176 L2.34509057,3.5922176 C1.32502959,3.56974186 0.436201508,4.28320156 0.237499481,5.28397479 C-0.0791784114,6.39223146 -0.0791784114,7.56702328 0.237499481,8.67527995 C0.330009274,9.60726159 1.09474199,10.3288099 2.03052265,10.3670511 L3.19043766,10.3670511 L3.19043766,8.84246671 C3.22234371,7.69765451 4.15284456,6.78248066 5.29802875,6.76959139 L8.6678079,6.76959139 C9.1164415,6.76870271 9.54631584,6.58948597 9.86271951,6.27142682 C10.1791232,5.95336768 10.3560942,5.52256395 10.3546417,5.07393182 L10.3546417,1.89655803 C10.2917932,0.983846775 9.57841181,0.250288445 8.6678079,0.162014559 C8.08672368,0.068085904 7.49884511,0.0225557014 6.91022782,0.0258929487 Z M5.08567792,1.04873523 C5.34294325,1.04759898 5.57554486,1.20159413 5.67496446,1.43887557 C5.77438406,1.67615701 5.72102999,1.949966 5.53979414,2.13255928 C5.3585583,2.31515256 5.08515505,2.37054826 4.84713837,2.27290199 C4.60912168,2.17525572 4.45339517,1.94380967 4.45261173,1.68654303 C4.45189759,1.33584511 4.73498444,1.05063797 5.08567792,1.04873523 Z"/>
|
||||
<path fill="#FFC900" d="M8.50000002,13.807406 C7.45109315,14.0968124 6.33993811,14.0804483 5.29807071,13.7583137 C4.41513055,13.643434 3.72150753,12.9461818 3.61123695,12.0626542 L3.61123695,8.88529435 C3.61967392,7.95575276 4.36858581,7.20292244 5.29807071,7.18963478 L8.66784986,7.18963478 C9.82504854,7.16601208 10.7562488,6.23123984 10.7754409,5.07395919 L10.7754409,3.592217 L12.0415733,3.592217 C12.9506997,3.64857649 13.674705,4.37470095 13.7284071,5.28398818 C14.0048744,6.16561371 14.0605486,7.09795037 13.8954295,8 L8.5,8 L8.5,10.3670645 L6.98493245,10.3670645 L6.98493245,10.7909689 L8.5,10.7909689 L8.5,11.7657843 C8.47620541,11.7836604 8.45356774,11.8032931 8.43229119,11.8245979 C8.31355397,11.9434925 8.24694519,12.1047081 8.24713449,12.2727391 C8.24651523,12.4759251 8.3426369,12.6635706 8.5,12.7823028 L8.5,13.8074063 Z"/>
|
||||
</g>
|
||||
<polygon fill="#62B543" points="12.752 16 10.258 10 11.428 10 13.242 14.607 15.048 10 16.192 10 13.698 16"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 2.5 KiB |
+1
-2
@@ -8,7 +8,6 @@
|
||||
</dependencies>
|
||||
|
||||
<extensions defaultExtensionNs="com.intellij">
|
||||
<iconMapper mappingFile="PythonVenvIconMappings.json"/>
|
||||
<python.common.toolToIconMapper implementation="com.intellij.python.community.impl.venv.PyReqToolIdToIconMapper"/>
|
||||
<python.common.toolToIconMapper implementation="com.intellij.python.venv.PyReqToolIdToIconMapper"/>
|
||||
</extensions>
|
||||
</idea-plugin>
|
||||
-19
@@ -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);
|
||||
}
|
||||
+4
-4
@@ -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
|
||||
}
|
||||
+1
-1
@@ -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
|
||||
+2
-2
@@ -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;
|
||||
+1
-1
@@ -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
|
||||
+1
-1
@@ -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
|
||||
@@ -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",
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<orderEntry type="module" module-name="intellij.platform.util" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.junit5Tests.framework" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.installer" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.impl.venv" />
|
||||
<orderEntry type="module" module-name="intellij.python.venv" />
|
||||
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
|
||||
<orderEntry type="module" module-name="intellij.python.psi.impl" />
|
||||
<orderEntry type="module" module-name="intellij.python.community.execService.python" />
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
<module name="intellij.python.psi.impl"/>
|
||||
<module name="intellij.python.sdk"/>
|
||||
<module name="intellij.python.community.execService"/>
|
||||
<module name="intellij.python.community.impl.venv"/>
|
||||
<module name="intellij.python.venv"/>
|
||||
<module name="intellij.python.community.services.shared"/>
|
||||
<module name="intellij.python.community.services.internal.impl"/>
|
||||
<module name="intellij.python.community.impl.installer"/>
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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<PyFlavorData.Emp
|
||||
|
||||
@Override
|
||||
public @NotNull Icon getIcon() {
|
||||
return PythonCommunityImplVenvIcons.Virtualenv;
|
||||
return PythonVenvIcons.VirtualEnv;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package com.intellij.python.junit5Tests.env.pyproject
|
||||
|
||||
import com.intellij.python.community.impl.venv.createVenv
|
||||
import com.intellij.python.venv.createVenv
|
||||
import com.intellij.python.junit5Tests.framework.env.PyEnvTestCase
|
||||
import com.intellij.python.junit5Tests.framework.env.PythonBinaryPath
|
||||
import com.intellij.python.pyproject.model.internal.pyProjectToml.walkFileSystemNoTomlContent
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ package com.intellij.python.junit5Tests.env.systemPython.impl
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.application.ApplicationManager
|
||||
import com.intellij.platform.eel.EelApi
|
||||
import com.intellij.python.community.impl.venv.createVenv
|
||||
import com.intellij.python.venv.createVenv
|
||||
import com.intellij.python.community.services.systemPython.SystemPythonProvider
|
||||
import com.intellij.python.community.services.systemPython.SystemPythonService
|
||||
import com.intellij.python.junit5Tests.framework.env.PyEnvTestCase
|
||||
|
||||
+1
-1
@@ -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.junit5Tests.env.venv.showCase
|
||||
|
||||
import com.intellij.python.community.impl.venv.createVenv
|
||||
import com.intellij.python.venv.createVenv
|
||||
import com.intellij.python.junit5Tests.framework.env.PyEnvTestCase
|
||||
import com.intellij.python.junit5Tests.framework.env.PythonBinaryPath
|
||||
import com.intellij.testFramework.common.timeoutRunBlocking
|
||||
|
||||
Reference in New Issue
Block a user