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

fixup

Browse Source 
GitOrigin-RevId: ec06f4c07039c6c14095e4cf1adc7b0049676638
This commit is contained in:
Aleksandr Sorotskii
2025-01-19 21:30:50 +01:00
committed by intellij-monorepo-bot
parent 2873bad618
commit 03a99d573d
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/src/com/jetbrains/python/packaging/PyPackageManagerUI.java
View File

@@ -25,6 +25,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.jetbrains.python.PyBundle;
import com.jetbrains.python.packaging.management.PythonPackagesInstaller;
import com.jetbrains.python.packaging.ui.PyPackageManagementService;
import com.jetbrains.python.sdk.uv.UvExtKt;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -267,6 +268,7 @@ public final class PyPackageManagerUI {
var result = PythonPackagesInstaller.Companion.installPackages(
myProject,
mySdk,
myRequirements,
myExtraArgs,
indicator
@@ -310,6 +312,11 @@ public final class PyPackageManagerUI {
@Override
protected @NotNull List<ExecutionException> runTask(@NotNull ProgressIndicator indicator) {
final List<ExecutionException> exceptions = new ArrayList<>();
if (UvExtKt.isUv(mySdk)) {
// FIXME: lame hack
return exceptions;
}
final PyPackageManager manager = PyPackageManagers.getInstance().forSdk(mySdk);
indicator.setText(PyBundle.message("python.packaging.installing.packaging.tools"));
indicator.setIndeterminate(true);
@@ -372,4 +379,4 @@ public final class PyPackageManagerUI {
return PyBundle.message("python.packaging.notification.title.uninstall.packages.failed");
}
}
}
}

4
python/src/com/jetbrains/python/packaging/management/PythonPackageInstaller.kt
View File

@@ -1,10 +1,11 @@
// 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.packaging
package com.jetbrains.python.packaging.management
import com.intellij.execution.ExecutionException
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.runBlockingCancellable
import com.intellij.openapi.project.Project
import com.intellij.openapi.projectRoots.Sdk
import com.jetbrains.python.PyBundle
import com.jetbrains.python.packaging.PyRequirement
import com.jetbrains.python.packaging.common.PythonPackageSpecificationBase
@@ -15,6 +16,7 @@ class PythonPackagesInstaller {
@JvmStatic
fun installPackages(
project: Project,
sdk: Sdk,
requirements: List<PyRequirement>?,
extraArgs: List<String>,
indicator: ProgressIndicator,