diff --git a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt index 3170ab0fa7b1..b79baf2b33b9 100644 --- a/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt +++ b/python/ide/impl/src/com/intellij/pycharm/community/ide/impl/configuration/PyPoetrySdkConfiguration.kt @@ -15,12 +15,12 @@ import com.intellij.openapi.ui.ValidationInfo import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.platform.ide.progress.withBackgroundProgress import com.intellij.pycharm.community.ide.impl.PyCharmCommunityCustomizationBundle +import com.intellij.python.community.impl.poetry.poetryPath import com.intellij.ui.IdeBorderFactory import com.intellij.ui.components.JBLabel import com.intellij.util.concurrency.annotations.RequiresBackgroundThread import com.intellij.util.ui.JBUI import com.jetbrains.python.PyBundle -import com.jetbrains.python.poetry.poetryPath import com.jetbrains.python.sdk.* import com.jetbrains.python.sdk.configuration.PyProjectSdkConfigurationExtension import com.jetbrains.python.sdk.poetry.* diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstallerUsagesCollector.kt b/python/installer/src/com/intellij/python/community/impl/installer/BinaryInstallerUsagesCollector.kt similarity index 96% rename from python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstallerUsagesCollector.kt rename to python/installer/src/com/intellij/python/community/impl/installer/BinaryInstallerUsagesCollector.kt index fa224ffd707c..bd634cf5fbae 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstallerUsagesCollector.kt +++ b/python/installer/src/com/intellij/python/community/impl/installer/BinaryInstallerUsagesCollector.kt @@ -1,5 +1,5 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.jetbrains.python.sdk.installer +// 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.installer import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.events.EventField @@ -10,6 +10,7 @@ import com.intellij.openapi.project.Project import com.intellij.util.system.CpuArch import com.jetbrains.python.sdk.Product import com.jetbrains.python.sdk.Release +import com.jetbrains.python.sdk.installer.* import org.jetbrains.annotations.ApiStatus @ApiStatus.Internal @@ -62,7 +63,7 @@ object BinaryInstallerUsagesCollector : CounterUsagesCollector() { /** * regexp: non-empty value consists of digits-dots-dashes in various combinations (like 1, 1.2, 1.2.3-456) * Can't use EventFields.Version because of dashes - * @see com.intellij.internal.statistic.eventLog.events.EventFields.Version + * @see EventFields.Version */ private val version = EventFields.StringValidatedByInlineRegexp("version", """^[\d\-.]+$""") diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/CondaInstallManager.kt b/python/installer/src/com/intellij/python/community/impl/installer/CondaInstallManager.kt similarity index 92% rename from python/installer/src/com/jetbrains/python/sdk/installer/CondaInstallManager.kt rename to python/installer/src/com/intellij/python/community/impl/installer/CondaInstallManager.kt index 4661748ac3d5..849bfeb566ff 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/CondaInstallManager.kt +++ b/python/installer/src/com/intellij/python/community/impl/installer/CondaInstallManager.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.jetbrains.python.sdk.installer +package com.intellij.python.community.impl.installer import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.openapi.project.Project @@ -9,12 +9,16 @@ import com.jetbrains.python.sdk.Product import com.jetbrains.python.sdk.Resource import com.jetbrains.python.sdk.ResourceType import com.jetbrains.python.sdk.SdksKeeper +import com.jetbrains.python.sdk.installer.MakeShellScriptExecutableException +import com.jetbrains.python.sdk.installer.installBinary +import com.jetbrains.python.sdk.installer.selectInstallations import java.nio.file.Path import kotlin.io.path.absolutePathString object CondaInstallManager { - internal class WindowsInstaller(private val installPath: String) : ResourceTypeBinaryInstaller(ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) { + internal class WindowsInstaller(private val installPath: String) : ResourceTypeBinaryInstaller( + ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) { /** * Miniconda3-{version}-Windows-x86_64.exe {options} * diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/DownloadableBinaryInstaller.kt b/python/installer/src/com/intellij/python/community/impl/installer/DownloadableBinaryInstaller.kt similarity index 95% rename from python/installer/src/com/jetbrains/python/sdk/installer/DownloadableBinaryInstaller.kt rename to python/installer/src/com/intellij/python/community/impl/installer/DownloadableBinaryInstaller.kt index 672f8faa92c9..92de62296d20 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/DownloadableBinaryInstaller.kt +++ b/python/installer/src/com/intellij/python/community/impl/installer/DownloadableBinaryInstaller.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.jetbrains.python.sdk.installer +package com.intellij.python.community.impl.installer import com.google.common.hash.Hashing import com.google.common.io.Files @@ -12,6 +12,7 @@ import com.intellij.util.io.HttpRequests import com.jetbrains.python.PySdkBundle import com.jetbrains.python.sdk.Binary import com.jetbrains.python.sdk.Resource +import com.jetbrains.python.sdk.installer.* import java.nio.file.Path import java.nio.file.Paths import kotlin.io.path.fileSize @@ -100,6 +101,6 @@ internal abstract class DownloadableBinaryInstaller : BinaryInstaller { } override fun getPreview(binary: Binary): ResourcePreview { - return ResourcePreview.of(getResourcesToDownload(binary).firstOrNull()) + return ResourcePreview.Companion.of(getResourcesToDownload(binary).firstOrNull()) } } \ No newline at end of file diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/PyInstallerBundle.kt b/python/installer/src/com/intellij/python/community/impl/installer/PyInstallerBundle.kt similarity index 78% rename from python/installer/src/com/jetbrains/python/sdk/installer/PyInstallerBundle.kt rename to python/installer/src/com/intellij/python/community/impl/installer/PyInstallerBundle.kt index 36c5533d8071..966461577565 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/PyInstallerBundle.kt +++ b/python/installer/src/com/intellij/python/community/impl/installer/PyInstallerBundle.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.jetbrains.python.sdk.installer +package com.intellij.python.community.impl.installer import com.intellij.DynamicBundle import org.jetbrains.annotations.Nls @@ -7,23 +7,21 @@ import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey import java.util.function.Supplier -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - internal object PyInstallerBundle { private const val BUNDLE_FQN: @NonNls String = "messages.PyInstaller" private val BUNDLE = DynamicBundle(PyInstallerBundle::class.java, BUNDLE_FQN) fun message( key: @PropertyKey(resourceBundle = BUNDLE_FQN) String, - vararg params: Any + vararg params: Any, ): @Nls String { return BUNDLE.getMessage(key, *params) } fun messagePointer( key: @PropertyKey(resourceBundle = BUNDLE_FQN) String, - vararg params: Any + vararg params: Any, ): Supplier { return BUNDLE.getLazyMessage(key, *params) } -} +} \ No newline at end of file diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/PySdkToInstallManager.kt b/python/installer/src/com/intellij/python/community/impl/installer/PySdkToInstallManager.kt similarity index 91% rename from python/installer/src/com/jetbrains/python/sdk/installer/PySdkToInstallManager.kt rename to python/installer/src/com/intellij/python/community/impl/installer/PySdkToInstallManager.kt index 1812970a9b86..2ac627629c1b 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/PySdkToInstallManager.kt +++ b/python/installer/src/com/intellij/python/community/impl/installer/PySdkToInstallManager.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.jetbrains.python.sdk.installer +package com.intellij.python.community.impl.installer import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.util.ExecUtil @@ -9,6 +9,7 @@ import com.jetbrains.python.sdk.Product import com.jetbrains.python.sdk.Resource import com.jetbrains.python.sdk.ResourceType import com.jetbrains.python.sdk.SdksKeeper +import com.jetbrains.python.sdk.installer.BinaryInstallation import java.nio.file.Path import kotlin.io.path.absolutePathString @@ -28,7 +29,7 @@ object PySdkToInstallManager { /** * Software Release Installer for Microsoft Window Executable (exe) files */ -internal class ExeBinaryInstaller : ResourceTypeBinaryInstaller(ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) { + internal class ExeBinaryInstaller : ResourceTypeBinaryInstaller(ResourceType.MICROSOFT_WINDOWS_EXECUTABLE) { override fun buildCommandLine(resource: Resource, path: Path): GeneralCommandLine { return GeneralCommandLine(path.absolutePathString(), "/repair", "/quiet", "InstallAllUsers=0") } diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/ResourceTypeBinaryInstaller.kt b/python/installer/src/com/intellij/python/community/impl/installer/ResourceTypeBinaryInstaller.kt similarity index 96% rename from python/installer/src/com/jetbrains/python/sdk/installer/ResourceTypeBinaryInstaller.kt rename to python/installer/src/com/intellij/python/community/impl/installer/ResourceTypeBinaryInstaller.kt index abef01565cd7..4506281ca637 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/ResourceTypeBinaryInstaller.kt +++ b/python/installer/src/com/intellij/python/community/impl/installer/ResourceTypeBinaryInstaller.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.jetbrains.python.sdk.installer +package com.intellij.python.community.impl.installer import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.process.CapturingProcessHandler @@ -9,6 +9,7 @@ import com.jetbrains.python.PySdkBundle import com.jetbrains.python.sdk.Binary import com.jetbrains.python.sdk.Resource import com.jetbrains.python.sdk.ResourceType +import com.jetbrains.python.sdk.installer.* import java.nio.file.Path /** diff --git a/python/installer/src/com/intellij/python/community/impl/installer/package-info.java b/python/installer/src/com/intellij/python/community/impl/installer/package-info.java new file mode 100644 index 000000000000..07ddabe9a2ba --- /dev/null +++ b/python/installer/src/com/intellij/python/community/impl/installer/package-info.java @@ -0,0 +1,5 @@ +// Copyright 2000-2025 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.installer; + +import org.jetbrains.annotations.ApiStatus; \ No newline at end of file diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstaller.kt b/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstaller.kt index eb91cd78530d..3f107e3d9ee2 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstaller.kt +++ b/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstaller.kt @@ -8,8 +8,14 @@ import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.progress.Task import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages +import com.intellij.python.community.impl.installer.BinaryInstallerUsagesCollector +import com.intellij.python.community.impl.installer.PyInstallerBundle import com.intellij.util.concurrency.annotations.RequiresEdt -import com.jetbrains.python.sdk.* +import com.jetbrains.python.sdk.Binary +import com.jetbrains.python.sdk.Release +import com.jetbrains.python.sdk.Resource + +// Symbols in this class aren't public API, do not use them! internal val LOGGER: Logger = logger() diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstallerException.kt b/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstallerException.kt index 22d9cac75c78..1d178b0d6416 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstallerException.kt +++ b/python/installer/src/com/jetbrains/python/sdk/installer/BinaryInstallerException.kt @@ -7,6 +7,8 @@ import com.intellij.openapi.progress.ProcessCanceledException import java.io.IOException import java.nio.file.Path +// Symbols in this class aren't public API, do not use them! + /** * Base Exception for the Software Release Installer. */ diff --git a/python/installer/src/com/jetbrains/python/sdk/installer/package-info.java b/python/installer/src/com/jetbrains/python/sdk/installer/package-info.java index 86148755584b..10dde93599a8 100644 --- a/python/installer/src/com/jetbrains/python/sdk/installer/package-info.java +++ b/python/installer/src/com/jetbrains/python/sdk/installer/package-info.java @@ -1,4 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +/** + * Symbols in this class aren't public API, do not use them! + */ @ApiStatus.Internal package com.jetbrains.python.sdk.installer; diff --git a/python/junit5Tests-framework/src/com/intellij/python/junit5Tests/framework/env/impl/VanillaPythonEnvExtension.kt b/python/junit5Tests-framework/src/com/intellij/python/junit5Tests/framework/env/impl/VanillaPythonEnvExtension.kt index 476ecf60e8a6..788b6b50ddfc 100644 --- a/python/junit5Tests-framework/src/com/intellij/python/junit5Tests/framework/env/impl/VanillaPythonEnvExtension.kt +++ b/python/junit5Tests-framework/src/com/intellij/python/junit5Tests/framework/env/impl/VanillaPythonEnvExtension.kt @@ -5,9 +5,9 @@ import com.intellij.execution.configurations.GeneralCommandLine import com.intellij.execution.process.CapturingProcessHandler import com.intellij.ide.util.PropertiesComponent import com.intellij.openapi.util.SystemInfoRt +import com.intellij.python.community.impl.poetry.poetryPath import com.intellij.python.junit5Tests.framework.env.PythonBinaryPath import com.jetbrains.python.PythonBinary -import com.jetbrains.python.poetry.poetryPath import com.jetbrains.python.tools.PythonType import java.nio.file.Path diff --git a/python/pluginCore/resources/META-INF/plugin.xml b/python/pluginCore/resources/META-INF/plugin.xml index c51bd939184c..a9932707b227 100644 --- a/python/pluginCore/resources/META-INF/plugin.xml +++ b/python/pluginCore/resources/META-INF/plugin.xml @@ -1,5 +1,4 @@ - + @@ -526,7 +525,7 @@ The Python plug-in provides smart editing for Python scripts. The feature set of - +