diff -r a0600d883f9e -r bbe0a4b0832e src/eric7/UI/VersionsDialog.py
--- a/src/eric7/UI/VersionsDialog.py Tue Dec 06 17:42:24 2022 +0100
+++ b/src/eric7/UI/VersionsDialog.py Tue Dec 06 19:46:18 2022 +0100
@@ -78,59 +78,51 @@
msg = ""
- pip = ericApp().getObject("Pip")
- venvManager = ericApp().getObject("VirtualEnvManager")
+ with EricOverrideCursor():
+ pip = ericApp().getObject("Pip")
+ pyqtUpdateAvailable, pyqtVersionsData = pip.checkPackageOutdated(
+ "pyqt6", "system>", interpreter=sys.executable
+ )
+ ericUpdateAvailable, ericVersionsData = pip.checkPackageOutdated(
+ "eric-ide", "system>", interpreter=sys.executable
+ )
+
+ if pyqtUpdateAvailable or ericUpdateAvailable:
+ self.buttonBox.removeButton(self.__checkUpdateButton)
+ self.__checkUpdateButton = None
+ else:
+ msg = self.tr("No upgrades available.")
- environmentName = (
- venvManager.environmentForInterpreter(sys.executable)[0]
- # just the name is needed
+ if ericUpdateAvailable:
+ self.__upgradeEricButton = self.buttonBox.addButton(
+ upgradeButtonTemplate.format("eric7"),
+ QDialogButtonBox.ButtonRole.ActionRole,
+ )
+ self.__upgradeEricButton.clicked.connect(self.__ui.upgradeEric)
+ msg += headerTemplate.format("eric7")
+ msg += tableTemplate.format(entryTemplate.format(*ericVersionsData[0]))
+
+ if pyqtUpdateAvailable:
+ self.__upgradePyQtButton = self.buttonBox.addButton(
+ upgradeButtonTemplate.format("PyQt6"),
+ QDialogButtonBox.ButtonRole.ActionRole,
+ )
+ self.__upgradePyQtButton.clicked.connect(self.__ui.upgradePyQt)
+ msg += headerTemplate.format("PyQt6")
+ msg += tableTemplate.format(
+ "".join(entryTemplate.format(*v) for v in pyqtVersionsData)
+ )
+
+ if ericUpdateAvailable and pyqtUpdateAvailable:
+ self.__upgradeBothButton = self.buttonBox.addButton(
+ upgradeButtonTemplate.format(self.tr("Both")),
+ QDialogButtonBox.ButtonRole.ActionRole,
+ )
+ self.__upgradeBothButton.clicked.connect(self.__ui.upgradeEricPyQt)
+
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setDefault(True)
+ self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setFocus(
+ Qt.FocusReason.OtherFocusReason
)
- if environmentName:
- with EricOverrideCursor():
- pyqtUpdateAvailable, pyqtVersionsData = pip.checkPackageOutdated(
- "pyqt6", environmentName
- )
- ericUpdateAvailable, ericVersionsData = pip.checkPackageOutdated(
- "eric-ide", environmentName
- )
-
- if pyqtUpdateAvailable or ericUpdateAvailable:
- self.buttonBox.removeButton(self.__checkUpdateButton)
- self.__checkUpdateButton = None
- else:
- msg = self.tr("No upgrades available.")
-
- if ericUpdateAvailable:
- self.__upgradeEricButton = self.buttonBox.addButton(
- upgradeButtonTemplate.format("eric7"),
- QDialogButtonBox.ButtonRole.ActionRole,
- )
- self.__upgradeEricButton.clicked.connect(self.__ui.upgradeEric)
- msg += headerTemplate.format("eric7")
- msg += tableTemplate.format(entryTemplate.format(*ericVersionsData[0]))
-
- if pyqtUpdateAvailable:
- self.__upgradePyQtButton = self.buttonBox.addButton(
- upgradeButtonTemplate.format("PyQt6"),
- QDialogButtonBox.ButtonRole.ActionRole,
- )
- self.__upgradePyQtButton.clicked.connect(self.__ui.upgradePyQt)
- msg += headerTemplate.format("PyQt6")
- msg += tableTemplate.format(
- "".join(entryTemplate.format(*v) for v in pyqtVersionsData)
- )
-
- if ericUpdateAvailable and pyqtUpdateAvailable:
- self.__upgradeBothButton = self.buttonBox.addButton(
- upgradeButtonTemplate.format(self.tr("Both")),
- QDialogButtonBox.ButtonRole.ActionRole,
- )
- self.__upgradeBothButton.clicked.connect(self.__ui.upgradeEricPyQt)
-
- self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setDefault(True)
- self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setFocus(
- Qt.FocusReason.OtherFocusReason
- )
-
- EricMessageBox.information(self, self.tr("Check for Upgrades"), msg)
+ EricMessageBox.information(self, self.tr("Check for Upgrades"), msg)
