eric: comparison PipInterface/PipPackagesWidget.py

-:6e2ed2aac325
+:3985c1a67fa2
 import UI.PixmapCache
 from .Pip import Pip
+# TODO: use icons for action buttons
+# TODO: show package details for installed packages
 class PipPackagesWidget(QWidget, Ui_PipPackagesWidget):
 """
 Class implementing the pip packages management widget.
 """
 ShowProcessGeneralMode = 0
 self.__updateActionButtons()
 self.statusLabel.hide()
 self.searchWidget.hide()
-self.__detailsData = {}
+self.__queryName = []
-self.__query = []
+self.__querySummary = []
 self.__packageDetailsDialog = None
 def __populateEnvironments(self):
 """
 def __updateSearchButton(self):
 """
 Private method to update the state of the search button.
 """
 self.searchButton.setEnabled(
-bool(self.searchEdit.text()) and
+(bool(self.searchEditName.text()) or
+bool(self.searchEditSummary.text())) and
 self.__isPipAvailable()
 )
 @pyqtSlot(bool)
 def on_searchToggleButton_toggled(self, checked):
 @type bool
 """
 self.searchWidget.setVisible(checked)
 if checked:
-self.searchEdit.setFocus(Qt.OtherFocusReason)
+self.searchEditName.setFocus(Qt.OtherFocusReason)
-self.searchEdit.selectAll()
+self.searchEditName.selectAll()
 self.__updateSearchActionButtons()
 self.__updateSearchButton()
 @pyqtSlot(str)
-def on_searchEdit_textChanged(self, txt):
+def on_searchEditName_textChanged(self, txt):
 """
 Private slot handling a change of the search term.
 @param txt search term
 @type str
 """
 self.__updateSearchButton()
 @pyqtSlot()
-def on_searchEdit_returnPressed(self):
+def on_searchEditName_returnPressed(self):
+"""
+Private slot initiating a search via a press of the Return key.
+"""
+self.__search()
+@pyqtSlot(str)
+def on_searchEditSummary_textChanged(self, txt):
+"""
+Private slot handling a change of the search term.
+@param txt search term
+@type str
+"""
+self.__updateSearchButton()
+@pyqtSlot()
+def on_searchEditSummary_returnPressed(self):
 """
 Private slot initiating a search via a press of the Return key.
 """
 self.__search()
 self.searchButton.setEnabled(False)
 QApplication.setOverrideCursor(Qt.WaitCursor)
 QApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
-self.__query = [term for term in self.searchEdit.text().strip().split()
+self.__queryName = [
-if term not in self.SearchStopwords]
+term for term in self.searchEditName.text().strip().split()
+if term not in self.SearchStopwords
+]
+self.__querySummary = [
+term for term in self.searchEditSummary.text().strip().split()
+if term not in self.SearchStopwords
+]
 self.__client.call(
 "search",
-({"name": self.__query, "summary": self.__query}, "or"),
+({"name": self.__queryName,
+"summary": self.__querySummary},
+self.searchTermCombineComboBox.currentText()),
 self.__processSearchResult,
 self.__searchError
 )
 def __processSearchResult(self, data):
 QApplication.restoreOverrideCursor()
 self.__updateSearchActionButtons()
 self.__updateSearchButton()
-self.searchEdit.setFocus(Qt.OtherFocusReason)
+self.searchEditName.setFocus(Qt.OtherFocusReason)
 def __searchError(self, errorCode, errorString):
 """
 Private method handling a search error.
 @type str
 @return score value
 @rtype int
 """
 score = 0
-for queryTerm in self.__query:
+for queryTerm in self.__queryName:
 if queryTerm.lower() in name.lower():
 score += 4
 if queryTerm.lower() == name.lower():
 score += 4
+for queryTerm in self.__querySummary:
 if queryTerm.lower() in summary.lower():
 if QRegExp(r'\b{0}\b'.format(QRegExp.escape(queryTerm)),
 Qt.CaseInsensitive).indexIn(summary) != -1:
 # word match gets even higher score
 score += 2
 @type QTreeWidgetItem
 """
 self.showDetailsButton.setEnabled(False)
 QApplication.setOverrideCursor(Qt.WaitCursor)
 QApplication.processEvents(QEventLoop.ExcludeUserInputEvents)
-self.__detailsData = {}
 if not item:
 item = self.searchResultList.selectedItems()[0]
 packageVersions = item.data(0, self.SearchVersionRole)
 self.tr("Select the package version:"),
 packageVersions,
 0, False)
 if not ok:
 return
 packageName = item.text(0)
-self.__client.call(
+packageData = self.__pip.getPackageDetails(packageName, packageVersion)
-"release_data",
-(packageName, packageVersion),
+QApplication.restoreOverrideCursor()
-lambda d: self.__getPackageDownloadsData(packageName,
+if packageData:
-packageVersion,
+from .PipPackageDetailsDialog import PipPackageDetailsDialog
-d),
-lambda c, s: self.__detailsError(packageName, c, s)
+self.showDetailsButton.setEnabled(True)
-)
+if self.__packageDetailsDialog is not None:
-def __getPackageDownloadsData(self, packageName, packageVersion, data):
+self.__packageDetailsDialog.close()
-"""
-Private method to store the details data and get downloads
+self.__packageDetailsDialog = \
-information.
+PipPackageDetailsDialog(packageData, self)
+self.__packageDetailsDialog.show()
-@param packageName name of the package
-@type str
-@param packageVersion version info
-@type str
-@param data result data with package details in the first
-element
-@type tuple
-"""
-if data and data[0]:
-self.__detailsData = data[0]
-self.__client.call(
-"release_urls",
-(packageName, packageVersion),
-self.__displayPackageDetails,
-lambda c, s: self.__detailsError(packageName, c, s)
-)
 else:
-QApplication.restoreOverrideCursor()
 E5MessageBox.warning(
 self,
 self.tr("Search PyPI"),
 self.tr("""<p>No package details info for <b>{0}</b>"""
 """ available.</p>""").format(packageName))
-def __displayPackageDetails(self, data):
-"""
-Private method to display the returned package details.
-@param data result data with downloads information in the first element
-@type tuple
-"""
-from .PipPackageDetailsDialog import PipPackageDetailsDialog
-QApplication.restoreOverrideCursor()
-self.showDetailsButton.setEnabled(True)
-if self.__packageDetailsDialog is not None:
-self.__packageDetailsDialog.close()
-self.__packageDetailsDialog = \
-PipPackageDetailsDialog(self.__detailsData, data[0], self)
-self.__packageDetailsDialog.show()
-def __detailsError(self, packageName, errorCode, errorString):
-"""
-Private method handling a details error.
-@param packageName name of the package
-@type str
-@param errorCode code of the error
-@type int
-@param errorString error message
-@type str
-"""
-QApplication.restoreOverrideCursor()
-self.showDetailsButton.setEnabled(True)
-E5MessageBox.warning(
-self,
-self.tr("Search PyPI"),
-self.tr("""<p>Package details info for <b>{0}</b> could not be"""
-""" retrieved.</p><p>Reason: {1}</p>""")
-.format(packageName, errorString)
-)
 #######################################################################
 ## Menu related methods below
 #######################################################################
 userSite=user)
 @pyqtSlot()
 def __installRequirements(self):
 """
+Private slot to install packages as given in a requirements file.
 """
-# TODO: call pip.installRequirements()
+venvName = self.environmentsComboBox.currentText()
+if venvName:
+self.__pip.installRequirements(venvName)
 @pyqtSlot()
 def __uninstallRequirements(self):
 """
+Private slot to uninstall packages as given in a requirements file.
 """
-# TODO: call pip.uninstallRequirements()
+venvName = self.environmentsComboBox.currentText()
+if venvName:
+self.__pip.uninstallRequirements(venvName)
 @pyqtSlot()
 def __generateRequirements(self):
 """
 Private slot to generate the contents for a requirements file.
 """
-# TODO: modify to get selected environment
+venvName = self.environmentsComboBox.currentText()
-from .PipFreezeDialog import PipFreezeDialog
+if venvName:
-self.__freezeDialog = PipFreezeDialog(self)
+from .PipFreezeDialog import PipFreezeDialog
-self.__freezeDialog.show()
+self.__freezeDialog = PipFreezeDialog(self.__pip, self)
-self.__freezeDialog.start()
+self.__freezeDialog.show()
+self.__freezeDialog.start(venvName)
 @pyqtSlot()
 def __editUserConfiguration(self):
 """
 Private slot to edit the user configuration.
 self.__editConfiguration()
 @pyqtSlot()
 def __editVirtualenvConfiguration(self):
 """
-Private slot to edit the current virtualenv configuration.
+Private slot to edit the configuration of the selected environment.
 """
-# TODO: modify to get selected environment
+venvName = self.environmentsComboBox.currentText()
-self.__editConfiguration(virtualenv=True)
+if venvName:
+self.__editConfiguration(venvName=venvName)
-def __editConfiguration(self, virtualenv=False):
+def __editConfiguration(self, venvName=""):
 """
 Private method to edit a configuration.
-@param virtualenv flag indicating to edit the current virtualenv
+@param venvName name of the environment to act upon
-configuration file
+@type str
-@type bool
+"""
-"""
-# TODO: modify to use venvName
 from QScintilla.MiniEditor import MiniEditor
-if virtualenv:
+if venvName:
-cfgFile = self.__getVirtualenvConfig()
+cfgFile = self.__pip.getVirtualenvConfig(venvName)
 if not cfgFile:
 return
 else:
-cfgFile = self.__getUserConfig()
+cfgFile = self.__pip.getUserConfig()
 cfgDir = os.path.dirname(cfgFile)
 if not cfgDir:
 E5MessageBox.critical(
 None,
 self.tr("Edit Configuration"),
 self.tr("""No valid configuration path determined."""
-""" Is a virtual environment selected? Aborting"""))
+""" Aborting"""))
 return
 try:
 if not os.path.isdir(cfgDir):
 os.makedirs(cfgDir)
 except OSError:
 E5MessageBox.critical(
 None,
 self.tr("Edit Configuration"),
 self.tr("""No valid configuration path determined."""
-""" Is a virtual environment selected? Aborting"""))
+""" Aborting"""))
 return
 if not os.path.exists(cfgFile):
 try:
 f = open(cfgFile, "w")
 if not os.access(cfgFile, os.W_OK):
 E5MessageBox.critical(
 None,
 self.tr("Edit Configuration"),
 self.tr("""No valid configuartion path determined."""
-""" Is a virtual environment selected? Aborting"""))
+""" Aborting"""))
 return
 self.__editor = MiniEditor(cfgFile, "Properties")
 self.__editor.show()

Mercurial Repositories > eric / file comparison

comparison: PipInterface/PipPackagesWidget.py

PipInterface/PipPackagesWidget.py