--- a/src/eric7/PipInterface/Pip.py Thu Oct 03 17:06:51 2024 +0200
+++ b/src/eric7/PipInterface/Pip.py Thu Oct 31 10:54:33 2024 +0100
@@ -304,7 +304,7 @@
if not interpreter:
return
- dia = PipDialog(self.tr("Install PIP"))
+ dia = PipDialog(self.tr("Install PIP"), parent=self.__ui)
commands = (
[(interpreter, ["-m", "ensurepip", "--user"])]
if userSite
@@ -351,7 +351,7 @@
args = ["-m", "pip", "install", "--ignore-installed"]
args.append("pip")
- dia = PipDialog(self.tr("Repair PIP"))
+ dia = PipDialog(self.tr("Repair PIP"), parent=self.__ui)
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -462,6 +462,16 @@
if not res:
# user rejected PyQt6 and/or eric-ide/eric7 update
packages = self.__filterUpgradePackages(packages)
+ if not packages:
+ EricMessageBox.information(
+ None,
+ self.tr("Upgrade Packages"),
+ self.tr(
+ "There are no packages except 'eric-ide' or 'PyQt6'"
+ " left for upgrade."
+ ),
+ )
+ return False
except AttributeError:
return False
@@ -473,7 +483,7 @@
if userSite:
args.append("--user")
args += packages
- dia = PipDialog(self.tr("Upgrade Packages"))
+ dia = PipDialog(self.tr("Upgrade Packages"), parent=self.__ui)
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -519,7 +529,7 @@
if forceReinstall:
args.append("--force-reinstall")
args += packages
- dia = PipDialog(self.tr("Install Packages"))
+ dia = PipDialog(self.tr("Install Packages"), parent=self.__ui)
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -533,7 +543,7 @@
"""
from .PipFileSelectionDialog import PipFileSelectionDialog
- dlg = PipFileSelectionDialog("requirements")
+ dlg = PipFileSelectionDialog("requirements", parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
requirements, user = dlg.getData()
if requirements and os.path.exists(requirements):
@@ -549,7 +559,9 @@
if user:
args.append("--user")
args += ["--requirement", requirements]
- dia = PipDialog(self.tr("Install Packages from Requirements"))
+ dia = PipDialog(
+ self.tr("Install Packages from Requirements"), parent=self.__ui
+ )
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -570,7 +582,7 @@
args += ["--index-url", indexUrl]
args += ["--editable", projectPath]
- dia = PipDialog(self.tr("Install Project"))
+ dia = PipDialog(self.tr("Install Project"), parent=self.__ui)
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -584,7 +596,7 @@
"""
from .PipFileSelectionDialog import PipFileSelectionDialog
- dlg = PipFileSelectionDialog("pyproject")
+ dlg = PipFileSelectionDialog("pyproject", parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
pyproject, user = dlg.getData()
if pyproject and os.path.exists(pyproject):
@@ -625,7 +637,9 @@
if user:
args.append("--user")
args += dependencies
- dia = PipDialog(self.tr("Install Packages from 'pyproject.toml'"))
+ dia = PipDialog(
+ self.tr("Install Packages from 'pyproject.toml'"), parent=self.__ui
+ )
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -654,7 +668,7 @@
if not interpreter:
return False
args = ["-m", "pip", "uninstall", "--yes"] + packages
- dia = PipDialog(self.tr("Uninstall Packages"))
+ dia = PipDialog(self.tr("Uninstall Packages"), parent=self.__ui)
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -670,7 +684,9 @@
from .PipFileSelectionDialog import PipFileSelectionDialog
if venvName:
- dlg = PipFileSelectionDialog("requirements", install=False)
+ dlg = PipFileSelectionDialog(
+ "requirements", install=False, parent=self.__ui
+ )
if dlg.exec() == QDialog.DialogCode.Accepted:
requirements, _user = dlg.getData()
if requirements and os.path.exists(requirements):
@@ -699,7 +715,10 @@
"--requirement",
requirements,
]
- dia = PipDialog(self.tr("Uninstall Packages from Requirements"))
+ dia = PipDialog(
+ self.tr("Uninstall Packages from Requirements"),
+ parent=self.__ui,
+ )
res = dia.startProcess(interpreter, args)
if res:
dia.exec()
@@ -714,7 +733,7 @@
from .PipFileSelectionDialog import PipFileSelectionDialog
if venvName:
- dlg = PipFileSelectionDialog("pyproject", install=False)
+ dlg = PipFileSelectionDialog("pyproject", install=False, parent=self.__ui)
if dlg.exec() == QDialog.DialogCode.Accepted:
pyproject, _user = dlg.getData()
if pyproject and os.path.exists(pyproject):
@@ -764,7 +783,8 @@
args = ["-m", "pip", "uninstall", "--yes"] + dependencies
dia = PipDialog(
- self.tr("Uninstall Packages from 'pyproject.toml'")
+ self.tr("Uninstall Packages from 'pyproject.toml'"),
+ parent=self.__ui,
)
res = dia.startProcess(interpreter, args)
if res:
@@ -1172,7 +1192,7 @@
interpreter = self.getVirtualenvInterpreter(venvName)
if interpreter:
args = ["-m", "pip", "cache", "info"]
- dia = PipDialog(self.tr("Cache Info"))
+ dia = PipDialog(self.tr("Cache Info"), parent=self.__ui)
res = dia.startProcess(interpreter, args, showArgs=False)
if res:
dia.exec()
@@ -1198,7 +1218,7 @@
args = ["-m", "pip", "cache", "list"]
if pattern.strip():
args.append(pattern.strip())
- dia = PipDialog(self.tr("List Cached Files"))
+ dia = PipDialog(self.tr("List Cached Files"), parent=self.__ui)
res = dia.startProcess(interpreter, args, showArgs=False)
if res:
dia.exec()
@@ -1222,7 +1242,7 @@
if ok and pattern.strip():
args = ["-m", "pip", "cache", "remove", pattern.strip()]
- dia = PipDialog(self.tr("Remove Cached Files"))
+ dia = PipDialog(self.tr("Remove Cached Files"), parent=self.__ui)
res = dia.startProcess(interpreter, args, showArgs=False)
if res:
dia.exec()
@@ -1247,7 +1267,7 @@
)
if ok:
args = ["-m", "pip", "cache", "purge"]
- dia = PipDialog(self.tr("Purge Cache"))
+ dia = PipDialog(self.tr("Purge Cache"), parent=self.__ui)
res = dia.startProcess(interpreter, args, showArgs=False)
if res:
dia.exec()
