eric: comparison eric6/PipInterface/PipPackagesWidget.py

-:e43bf8d7baf9
+:c53117374255
 ShowProcessEntryPointsMode = 2
 ShowProcessFilesListMode = 3
 SearchVersionRole = Qt.UserRole + 1
-SearchUrl = "https://pypi.org/search/"
 def __init__(self, pip, parent=None):
 """
 Constructor
 @param pip reference to the global pip interface
 "pip", Qt.MatchExactly | Qt.MatchCaseSensitive)
 if len(pipList) > 0:
 pipVersionTuple = Globals.versionToTuple(pipList[0].text(1))
 return pipVersionTuple
+def getPip(self):
+"""
+Public method to get a reference to the pip interface object.
+@return reference to the pip interface object
+@rtype Pip
+"""
+return self.__pip
 #######################################################################
 ## Slots handling widget signals below
 #######################################################################
 @type QTreeWidgetItem
 @param column activated column
 @type int
 """
 packageName = item.text(0)
+upgradable = bool(item.text(2))
 if column == 1:
 # show details for installed version
 packageVersion = item.text(1)
 else:
 # show details for available version or installed one
 if item.text(2):
 packageVersion = item.text(2)
 else:
 packageVersion = item.text(1)
-self.__showPackageDetails(packageName, packageVersion)
+self.__showPackageDetails(packageName, packageVersion,
+upgradable=upgradable)
 @pyqtSlot(bool)
 def on_verboseCheckBox_clicked(self, checked):
 """
 Private slot to handle a change of the verbose package information
 """
 Private slot to upgrade selected packages of the selected environment.
 """
 packages = [itm.text(0) for itm in self.__selectedUpdateableItems()]
 if packages:
-ok = self.__executeUpgradePackages(packages)
+self.executeUpgradePackages(packages)
-if ok:
-self.on_refreshButton_clicked()
 @pyqtSlot()
 def on_upgradeAllButton_clicked(self):
 """
 Private slot to upgrade all packages of the selected environment.
 """
 packages = [itm.text(0) for itm in self.__allUpdateableItems()]
 if packages:
-ok = self.__executeUpgradePackages(packages)
+self.executeUpgradePackages(packages)
-if ok:
-self.on_refreshButton_clicked()
 @pyqtSlot()
 def on_uninstallButton_clicked(self):
 """
 Private slot to remove selected packages of the selected environment.
 """
 packages = [itm.text(0) for itm in self.packagesList.selectedItems()]
+self.executeUninstallPackages(packages)
+def executeUninstallPackages(self, packages):
+"""
+Public method to uninstall the given list of packages.
+@param packages list of package names to be uninstalled
+@type list of str
+"""
 if packages:
 ok = self.__pip.uninstallPackages(
 packages,
 venvName=self.environmentsComboBox.currentText())
 if ok:
 self.on_refreshButton_clicked()
-def __executeUpgradePackages(self, packages):
+def executeUpgradePackages(self, packages):
 """
-Private method to execute the pip upgrade command.
+Public method to execute the pip upgrade command.
 @param packages list of package names to be upgraded
 @type list of str
-@return flag indicating success
-@rtype bool
 """
 ok = self.__pip.upgradePackages(
 packages, venvName=self.environmentsComboBox.currentText(),
 userSite=self.userCheckBox.isChecked())
-return ok
+if ok:
+self.on_refreshButton_clicked()
 @pyqtSlot()
 def on_showPackageDetailsButton_clicked(self):
 """
 Private slot to show information for the selected package.
 """
 item = self.packagesList.selectedItems()[0]
 if item:
 packageName = item.text(0)
+upgradable = bool(item.text(2))
 # show details for available version or installed one
 if item.text(2):
 packageVersion = item.text(2)
 else:
 packageVersion = item.text(1)
-self.__showPackageDetails(packageName, packageVersion)
+self.__showPackageDetails(packageName, packageVersion,
+upgradable=upgradable)
 #######################################################################
 ## Search widget related methods below
 #######################################################################
 searchTerm = self.searchEditName.text().strip()
 searchTerm = bytes(QUrl.toPercentEncoding(searchTerm)).decode()
 urlQuery = QUrlQuery()
 urlQuery.addQueryItem("q", searchTerm)
-url = QUrl(self.SearchUrl)
+url = QUrl(self.__pip.getIndexUrlSearch())
 url.setQuery(urlQuery)
 request = QNetworkRequest(QUrl(url))
 request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
 QNetworkRequest.AlwaysNetwork)
 except KeyError:
 description = ""
 itm = QTreeWidgetItem(
 self.searchResultList, [
 result['name'].strip(),
+result['version'],
 result["released"].strip(),
 description,
 ])
 itm.setData(0, self.SearchVersionRole, result['version'])
 @pyqtSlot()
 def on_installButton_clicked(self):
 """
 Private slot to handle pressing the Install button..
 """
-self.__install()
+packages = [
+itm.text(0).strip()
+for itm in self.searchResultList.selectedItems()
+]
+self.executeInstallPackages(packages)
 @pyqtSlot()
 def on_installUserSiteButton_clicked(self):
 """
 Private slot to handle pressing the Install to User-Site button..
 """
-self.__install(userSite=True)
+packages = [
+itm.text(0).strip()
-def __install(self, userSite=False):
+for itm in self.searchResultList.selectedItems()
-"""
+]
-Private slot to install the selected packages.
+self.executeInstallPackages(packages, userSite=True)
+def executeInstallPackages(self, packages, userSite=False):
+"""
+Public method to install the given list of packages.
+@param packages list of package names to be installed
+@type list of str
 @param userSite flag indicating to install to the user directory
 @type bool
 """
 venvName = self.environmentsComboBox.currentText()
-if venvName:
+if venvName and packages:
-packages = []
+self.__pip.installPackages(packages, venvName=venvName,
-for itm in self.searchResultList.selectedItems():
+userSite=userSite)
-packages.append(itm.text(0).strip())
+self.on_refreshButton_clicked()
-if packages:
-self.__pip.installPackages(packages, venvName=venvName,
-userSite=userSite)
-self.on_refreshButton_clicked()
 @pyqtSlot()
 def on_showDetailsButton_clicked(self):
 """
 Private slot to handle pressing the Show Details button.
 item = self.searchResultList.selectedItems()[0]
 packageVersion = item.data(0, self.SearchVersionRole)
 packageName = item.text(0)
-self.__showPackageDetails(packageName, packageVersion)
+self.__showPackageDetails(packageName, packageVersion,
+installable=True)
-def __showPackageDetails(self, packageName, packageVersion):
+def __showPackageDetails(self, packageName, packageVersion,
+upgradable=False, installable=False):
 """
 Private method to populate the package details dialog.
 @param packageName name of the package to show details for
 @type str
 @param packageVersion version of the package
 @type str
+@param upgradable flag indicating that the package may be upgraded
+(defaults to False)
+@type bool (optional)
+@param installable flag indicating that the package may be installed
+(defaults to False)
+@type bool (optional)
 """
 with E5OverrideCursor():
 packageData = self.__pip.getPackageDetails(
 packageName, packageVersion)
 if packageData:
 from .PipPackageDetailsDialog import PipPackageDetailsDialog
 self.showDetailsButton.setEnabled(True)
+if installable:
+buttonsMode = PipPackageDetailsDialog.ButtonInstall
+elif upgradable:
+buttonsMode = (
+PipPackageDetailsDialog.ButtonRemove |
+PipPackageDetailsDialog.ButtonUpgrade
+)
+else:
+buttonsMode = PipPackageDetailsDialog.ButtonRemove
 if self.__packageDetailsDialog is not None:
 self.__packageDetailsDialog.close()
 self.__packageDetailsDialog = (
-PipPackageDetailsDialog(packageData, self)
+PipPackageDetailsDialog(packageData, buttonsMode=buttonsMode,
+parent=self)
 )
 self.__packageDetailsDialog.show()
 else:
 E5MessageBox.warning(
 self,
 if venvName:
 from .PipPackagesInputDialog import PipPackagesInputDialog
 dlg = PipPackagesInputDialog(self, self.tr("Install Packages"))
 if dlg.exec() == QDialog.Accepted:
 packages, user = dlg.getData()
-if packages:
+self.executeInstallPackages(packages, userSite=user)
-self.__pip.installPackages(packages, venvName=venvName,
-userSite=user)
-self.on_refreshButton_clicked()
 @pyqtSlot()
 def __installLocalPackage(self):
 """
 Private slot to install a package available on local storage.
 from .PipFileSelectionDialog import PipFileSelectionDialog
 dlg = PipFileSelectionDialog(self, "package")
 if dlg.exec() == QDialog.Accepted:
 package, user = dlg.getData()
 if package and os.path.exists(package):
-self.__pip.installPackages([package], venvName=venvName,
+self.executeInstallPackages([package], userSite=user)
-userSite=user)
-self.on_refreshButton_clicked()
 @pyqtSlot()
 def __installRequirements(self):
 """
 Private slot to install packages as given in a requirements file.

Mercurial Repositories > eric / file comparison

comparison: eric6/PipInterface/PipPackagesWidget.py

eric6/PipInterface/PipPackagesWidget.py