--- a/PipInterface/Pip.py Wed Feb 20 19:44:13 2019 +0100
+++ b/PipInterface/Pip.py Thu Feb 21 19:55:35 2019 +0100
@@ -57,12 +57,12 @@
## self.__plugin.currentEnvironmentChanged.connect(
## self.__handleTearOffMenu)
- def initActions(self):
- """
- Public method to define the actions.
- """
- self.actions = []
-
+## def initActions(self):
+## """
+## Public method to define the actions.
+## """
+## self.actions = []
+##
## self.selectEnvironmentAct = E5Action(
## self.tr('Virtual Environment for pip'),
## self.tr('&Virtual Environment for pip'),
@@ -129,164 +129,164 @@
## self.__listOutdatedPackages)
## self.actions.append(self.listOutdatedPackagesAct)
##
- ##############################################
- ## Actions for installing packages
- ##############################################
-
- self.installPackagesAct = E5Action(
- self.tr('Install Packages'),
- self.tr('&Install Packages'),
- 0, 0,
- self, 'pip_install_packages')
- self.installPackagesAct.setStatusTip(self.tr(
- 'Install packages according to user input'))
- self.installPackagesAct.setWhatsThis(self.tr(
- """<b>Install Packages</b>"""
- """<p>This installs packages according to user input.</p>"""
- ))
- self.installPackagesAct.triggered.connect(self.__installPackages)
- self.actions.append(self.installPackagesAct)
-
- self.installLocalPackageAct = E5Action(
- self.tr('Install Local Package'),
- self.tr('Install Local Package'),
- 0, 0,
- self, 'pip_install_local_package')
- self.installLocalPackageAct.setStatusTip(self.tr(
- 'Install a package from local storage'))
- self.installLocalPackageAct.setWhatsThis(self.tr(
- """<b>Install Local Package</b>"""
- """<p>This installs a package available on local storage.</p>"""
- ))
- self.installLocalPackageAct.triggered.connect(
- self.__installLocalPackage)
- self.actions.append(self.installLocalPackageAct)
-
- self.installRequirementsAct = E5Action(
- self.tr('Install Requirements'),
- self.tr('Install Requirements'),
- 0, 0,
- self, 'pip_install_requirements')
- self.installRequirementsAct.setStatusTip(self.tr(
- 'Install packages according to a requirements file'))
- self.installRequirementsAct.setWhatsThis(self.tr(
- """<b>Install Requirements</b>"""
- """<p>This installs packages according to a requirements"""
- """ file.</p>"""
- ))
- self.installRequirementsAct.triggered.connect(
- self.__installRequirements)
- self.actions.append(self.installRequirementsAct)
-
- self.installPipAct = E5Action(
- self.tr('Install Pip'),
- self.tr('Install Pip'),
- 0, 0,
- self, 'pip_install_pip')
- self.installPipAct.setStatusTip(self.tr(
- 'Install the pip package itself'))
- self.installPipAct.setWhatsThis(self.tr(
- """<b>Install Pip</b>"""
- """<p>This installs the pip package itself.</p>"""
- ))
- self.installPipAct.triggered.connect(self.__installPip)
- self.actions.append(self.installPipAct)
-
- self.repairPipAct = E5Action(
- self.tr('Repair Pip'),
- self.tr('Repair Pip'),
- 0, 0,
- self, 'pip_repair_pip')
- self.repairPipAct.setStatusTip(self.tr(
- 'Repair the pip package'))
- self.repairPipAct.setWhatsThis(self.tr(
- """<b>Repair Pip</b>"""
- """<p>This repairs the pip package by re-installing it.</p>"""
- ))
- self.repairPipAct.triggered.connect(self.__repairPip)
- self.actions.append(self.repairPipAct)
-
- self.upgradePipAct = E5Action(
- self.tr('Upgrade Pip'),
- self.tr('Upgrade &Pip'),
- 0, 0,
- self, 'pip_upgrade_pip')
- self.upgradePipAct.setStatusTip(self.tr(
- 'Upgrade the pip package itself'))
- self.upgradePipAct.setWhatsThis(self.tr(
- """<b>Upgrade Pip</b>"""
- """<p>This upgrades the pip package itself.</p>"""
- ))
- self.upgradePipAct.triggered.connect(self.upgradePip)
- self.actions.append(self.upgradePipAct)
-
- self.upgradePackagesAct = E5Action(
- self.tr('Upgrade Packages'),
- self.tr('&Upgrade Packages'),
- 0, 0,
- self, 'pip_upgrade_packages')
- self.upgradePackagesAct.setStatusTip(self.tr(
- 'Upgrade packages according to user input'))
- self.upgradePackagesAct.setWhatsThis(self.tr(
- """<b>Upgrade Packages</b>"""
- """<p>This upgrades packages according to user input.</p>"""
- ))
- self.upgradePackagesAct.triggered.connect(self.__upgradePackages)
- self.actions.append(self.upgradePackagesAct)
-
- ##############################################
- ## Actions for uninstalling packages
- ##############################################
-
- self.uninstallPackagesAct = E5Action(
- self.tr('Uninstall Packages'),
- self.tr('Uninstall Packages'),
- 0, 0,
- self, 'pip_uninstall_packages')
- self.uninstallPackagesAct.setStatusTip(self.tr(
- 'Uninstall packages according to user input'))
- self.uninstallPackagesAct.setWhatsThis(self.tr(
- """<b>Uninstall Packages</b>"""
- """<p>This uninstalls packages according to user input.</p>"""
- ))
- self.uninstallPackagesAct.triggered.connect(self.__uninstallPackages)
- self.actions.append(self.uninstallPackagesAct)
-
- self.uninstallRequirementsAct = E5Action(
- self.tr('Uninstall Requirements'),
- self.tr('Uninstall Requirements'),
- 0, 0,
- self, 'pip_uninstall_requirements')
- self.uninstallRequirementsAct.setStatusTip(self.tr(
- 'Uninstall packages according to a requirements file'))
- self.uninstallRequirementsAct.setWhatsThis(self.tr(
- """<b>Uninstall Requirements</b>"""
- """<p>This uninstalls packages according to a requirements"""
- """ file.</p>"""
- ))
- self.uninstallRequirementsAct.triggered.connect(
- self.__uninstallRequirements)
- self.actions.append(self.uninstallRequirementsAct)
-
- ##############################################
- ## Actions for generating requirements files
- ##############################################
-
- self.generateRequirementsAct = E5Action(
- self.tr('Generate Requirements'),
- self.tr('&Generate Requirements...'),
- 0, 0,
- self, 'pip_generate_requirements')
- self.generateRequirementsAct.setStatusTip(self.tr(
- 'Generate the contents of a requirements file'))
- self.generateRequirementsAct.setWhatsThis(self.tr(
- """<b>Generate Requirements</b>"""
- """<p>This generates the contents of a requirements file.</p>"""
- ))
- self.generateRequirementsAct.triggered.connect(
- self.__generateRequirements)
- self.actions.append(self.generateRequirementsAct)
-
+## ##############################################
+## ## Actions for installing packages
+## ##############################################
+##
+## self.installPackagesAct = E5Action(
+## self.tr('Install Packages'),
+## self.tr('&Install Packages'),
+## 0, 0,
+## self, 'pip_install_packages')
+## self.installPackagesAct.setStatusTip(self.tr(
+## 'Install packages according to user input'))
+## self.installPackagesAct.setWhatsThis(self.tr(
+## """<b>Install Packages</b>"""
+## """<p>This installs packages according to user input.</p>"""
+## ))
+## self.installPackagesAct.triggered.connect(self.__installPackages)
+## self.actions.append(self.installPackagesAct)
+##
+## self.installLocalPackageAct = E5Action(
+## self.tr('Install Local Package'),
+## self.tr('Install Local Package'),
+## 0, 0,
+## self, 'pip_install_local_package')
+## self.installLocalPackageAct.setStatusTip(self.tr(
+## 'Install a package from local storage'))
+## self.installLocalPackageAct.setWhatsThis(self.tr(
+## """<b>Install Local Package</b>"""
+## """<p>This installs a package available on local storage.</p>"""
+## ))
+## self.installLocalPackageAct.triggered.connect(
+## self.__installLocalPackage)
+## self.actions.append(self.installLocalPackageAct)
+##
+## self.installRequirementsAct = E5Action(
+## self.tr('Install Requirements'),
+## self.tr('Install Requirements'),
+## 0, 0,
+## self, 'pip_install_requirements')
+## self.installRequirementsAct.setStatusTip(self.tr(
+## 'Install packages according to a requirements file'))
+## self.installRequirementsAct.setWhatsThis(self.tr(
+## """<b>Install Requirements</b>"""
+## """<p>This installs packages according to a requirements"""
+## """ file.</p>"""
+## ))
+## self.installRequirementsAct.triggered.connect(
+## self.__installRequirements)
+## self.actions.append(self.installRequirementsAct)
+##
+## self.installPipAct = E5Action(
+## self.tr('Install Pip'),
+## self.tr('Install Pip'),
+## 0, 0,
+## self, 'pip_install_pip')
+## self.installPipAct.setStatusTip(self.tr(
+## 'Install the pip package itself'))
+## self.installPipAct.setWhatsThis(self.tr(
+## """<b>Install Pip</b>"""
+## """<p>This installs the pip package itself.</p>"""
+## ))
+## self.installPipAct.triggered.connect(self.__installPip)
+## self.actions.append(self.installPipAct)
+##
+## self.repairPipAct = E5Action(
+## self.tr('Repair Pip'),
+## self.tr('Repair Pip'),
+## 0, 0,
+## self, 'pip_repair_pip')
+## self.repairPipAct.setStatusTip(self.tr(
+## 'Repair the pip package'))
+## self.repairPipAct.setWhatsThis(self.tr(
+## """<b>Repair Pip</b>"""
+## """<p>This repairs the pip package by re-installing it.</p>"""
+## ))
+## self.repairPipAct.triggered.connect(self.__repairPip)
+## self.actions.append(self.repairPipAct)
+##
+## self.upgradePipAct = E5Action(
+## self.tr('Upgrade Pip'),
+## self.tr('Upgrade &Pip'),
+## 0, 0,
+## self, 'pip_upgrade_pip')
+## self.upgradePipAct.setStatusTip(self.tr(
+## 'Upgrade the pip package itself'))
+## self.upgradePipAct.setWhatsThis(self.tr(
+## """<b>Upgrade Pip</b>"""
+## """<p>This upgrades the pip package itself.</p>"""
+## ))
+## self.upgradePipAct.triggered.connect(self.upgradePip)
+## self.actions.append(self.upgradePipAct)
+##
+## self.upgradePackagesAct = E5Action(
+## self.tr('Upgrade Packages'),
+## self.tr('&Upgrade Packages'),
+## 0, 0,
+## self, 'pip_upgrade_packages')
+## self.upgradePackagesAct.setStatusTip(self.tr(
+## 'Upgrade packages according to user input'))
+## self.upgradePackagesAct.setWhatsThis(self.tr(
+## """<b>Upgrade Packages</b>"""
+## """<p>This upgrades packages according to user input.</p>"""
+## ))
+## self.upgradePackagesAct.triggered.connect(self.__upgradePackages)
+## self.actions.append(self.upgradePackagesAct)
+##
+## ##############################################
+## ## Actions for uninstalling packages
+## ##############################################
+##
+## self.uninstallPackagesAct = E5Action(
+## self.tr('Uninstall Packages'),
+## self.tr('Uninstall Packages'),
+## 0, 0,
+## self, 'pip_uninstall_packages')
+## self.uninstallPackagesAct.setStatusTip(self.tr(
+## 'Uninstall packages according to user input'))
+## self.uninstallPackagesAct.setWhatsThis(self.tr(
+## """<b>Uninstall Packages</b>"""
+## """<p>This uninstalls packages according to user input.</p>"""
+## ))
+## self.uninstallPackagesAct.triggered.connect(self.__uninstallPackages)
+## self.actions.append(self.uninstallPackagesAct)
+##
+## self.uninstallRequirementsAct = E5Action(
+## self.tr('Uninstall Requirements'),
+## self.tr('Uninstall Requirements'),
+## 0, 0,
+## self, 'pip_uninstall_requirements')
+## self.uninstallRequirementsAct.setStatusTip(self.tr(
+## 'Uninstall packages according to a requirements file'))
+## self.uninstallRequirementsAct.setWhatsThis(self.tr(
+## """<b>Uninstall Requirements</b>"""
+## """<p>This uninstalls packages according to a requirements"""
+## """ file.</p>"""
+## ))
+## self.uninstallRequirementsAct.triggered.connect(
+## self.__uninstallRequirements)
+## self.actions.append(self.uninstallRequirementsAct)
+##
+## ##############################################
+## ## Actions for generating requirements files
+## ##############################################
+##
+## self.generateRequirementsAct = E5Action(
+## self.tr('Generate Requirements'),
+## self.tr('&Generate Requirements...'),
+## 0, 0,
+## self, 'pip_generate_requirements')
+## self.generateRequirementsAct.setStatusTip(self.tr(
+## 'Generate the contents of a requirements file'))
+## self.generateRequirementsAct.setWhatsThis(self.tr(
+## """<b>Generate Requirements</b>"""
+## """<p>This generates the contents of a requirements file.</p>"""
+## ))
+## self.generateRequirementsAct.triggered.connect(
+## self.__generateRequirements)
+## self.actions.append(self.generateRequirementsAct)
+##
## ##############################################
## ## Actions for generating requirements files
## ##############################################
@@ -306,67 +306,67 @@
## self.searchPyPIAct.triggered.connect(self.__searchPyPI)
## self.actions.append(self.searchPyPIAct)
##
- ##############################################
- ## Actions for editing configuration files
- ##############################################
-
- self.editUserConfigAct = E5Action(
- self.tr('Edit User Configuration'),
- self.tr('Edit User Configuration...'),
- 0, 0,
- self, 'pip_edit_user_config')
- self.editUserConfigAct.setStatusTip(self.tr(
- 'Open the per user configuration file in an editor'))
- self.editUserConfigAct.setWhatsThis(self.tr(
- """<b>Edit User Configuration</b>"""
- """<p>This opens the per user configuration file in an editor."""
- """</p>"""
- ))
- self.editUserConfigAct.triggered.connect(self.__editUserConfiguration)
- self.actions.append(self.editUserConfigAct)
-
- self.editVirtualenvConfigAct = E5Action(
- self.tr('Edit Current Virtualenv Configuration'),
- self.tr('Edit Current Virtualenv Configuration...'),
- 0, 0,
- self, 'pip_edit_virtualenv_config')
- self.editVirtualenvConfigAct.setStatusTip(self.tr(
- 'Open the current virtualenv configuration file in an editor'))
- self.editVirtualenvConfigAct.setWhatsThis(self.tr(
- """<b>Edit Current Virtualenv Configuration</b>"""
- """<p>This opens the current virtualenv configuration file in"""
- """ an editor. </p>"""
- ))
- self.editVirtualenvConfigAct.triggered.connect(
- self.__editVirtualenvConfiguration)
- self.actions.append(self.editVirtualenvConfigAct)
-
- self.pipConfigAct = E5Action(
- self.tr('Configure'),
- self.tr('Configure...'),
- 0, 0, self, 'pip_configure')
- self.pipConfigAct.setStatusTip(self.tr(
- 'Show the configuration dialog with the Python Package Management'
- ' page selected'
- ))
- self.pipConfigAct.setWhatsThis(self.tr(
- """<b>Configure</b>"""
- """<p>Show the configuration dialog with the Python Package"""
- """ Management page selected.</p>"""
- ))
- self.pipConfigAct.triggered.connect(self.__pipConfigure)
- self.actions.append(self.pipConfigAct)
-
- def initMenu(self):
- """
- Public slot to initialize the menu.
-
- @return the menu generated
- @rtype QMenu
- """
+## ##############################################
+## ## Actions for editing configuration files
+## ##############################################
+##
+## self.editUserConfigAct = E5Action(
+## self.tr('Edit User Configuration'),
+## self.tr('Edit User Configuration...'),
+## 0, 0,
+## self, 'pip_edit_user_config')
+## self.editUserConfigAct.setStatusTip(self.tr(
+## 'Open the per user configuration file in an editor'))
+## self.editUserConfigAct.setWhatsThis(self.tr(
+## """<b>Edit User Configuration</b>"""
+## """<p>This opens the per user configuration file in an editor."""
+## """</p>"""
+## ))
+## self.editUserConfigAct.triggered.connect(self.__editUserConfiguration)
+## self.actions.append(self.editUserConfigAct)
+##
+## self.editVirtualenvConfigAct = E5Action(
+## self.tr('Edit Current Virtualenv Configuration'),
+## self.tr('Edit Current Virtualenv Configuration...'),
+## 0, 0,
+## self, 'pip_edit_virtualenv_config')
+## self.editVirtualenvConfigAct.setStatusTip(self.tr(
+## 'Open the current virtualenv configuration file in an editor'))
+## self.editVirtualenvConfigAct.setWhatsThis(self.tr(
+## """<b>Edit Current Virtualenv Configuration</b>"""
+## """<p>This opens the current virtualenv configuration file in"""
+## """ an editor. </p>"""
+## ))
+## self.editVirtualenvConfigAct.triggered.connect(
+## self.__editVirtualenvConfiguration)
+## self.actions.append(self.editVirtualenvConfigAct)
+##
+## self.pipConfigAct = E5Action(
+## self.tr('Configure'),
+## self.tr('Configure...'),
+## 0, 0, self, 'pip_configure')
+## self.pipConfigAct.setStatusTip(self.tr(
+## 'Show the configuration dialog with the Python Package Management'
+## ' page selected'
+## ))
+## self.pipConfigAct.setWhatsThis(self.tr(
+## """<b>Configure</b>"""
+## """<p>Show the configuration dialog with the Python Package"""
+## """ Management page selected.</p>"""
+## ))
+## self.pipConfigAct.triggered.connect(self.__pipConfigure)
+## self.actions.append(self.pipConfigAct)
+##
+## def initMenu(self):
+## """
+## Public slot to initialize the menu.
+##
+## @return the menu generated
+## @rtype QMenu
+## """
## self.__menus = {} # clear menus references
##
- menu = QMenu()
+## menu = QMenu()
## menu.setTearOffEnabled(True)
## menu.setIcon(UI.PixmapCache.getIcon("pypi.png"))
##
@@ -376,47 +376,47 @@
## menu.addAction(self.listUptodatePackagesAct)
## menu.addAction(self.listOutdatedPackagesAct)
## menu.addSeparator()
- menu.addAction(self.installPipAct)
- menu.addSeparator()
- menu.addAction(self.installPackagesAct)
- menu.addAction(self.installLocalPackageAct)
- menu.addAction(self.installRequirementsAct)
- menu.addSeparator()
- menu.addAction(self.upgradePipAct)
+## menu.addAction(self.installPipAct)
+## menu.addSeparator()
+## menu.addAction(self.installPackagesAct)
+## menu.addAction(self.installLocalPackageAct)
+## menu.addAction(self.installRequirementsAct)
+## menu.addSeparator()
+## menu.addAction(self.upgradePipAct)
## menu.addAction(self.upgradePackagesAct)
- menu.addSeparator()
+## menu.addSeparator()
## menu.addAction(self.uninstallPackagesAct)
- menu.addAction(self.uninstallRequirementsAct)
- menu.addSeparator()
- menu.addAction(self.generateRequirementsAct)
- menu.addSeparator()
+## menu.addAction(self.uninstallRequirementsAct)
+## menu.addSeparator()
+## menu.addAction(self.generateRequirementsAct)
+## menu.addSeparator()
## menu.addAction(self.searchPyPIAct)
## menu.addSeparator()
- menu.addAction(self.repairPipAct)
- menu.addSeparator()
- menu.addAction(self.editUserConfigAct)
- menu.addAction(self.editVirtualenvConfigAct)
- menu.addSeparator()
- menu.addAction(self.pipConfigAct)
-
+## menu.addAction(self.repairPipAct)
+## menu.addSeparator()
+## menu.addAction(self.editUserConfigAct)
+## menu.addAction(self.editVirtualenvConfigAct)
+## menu.addSeparator()
+## menu.addAction(self.pipConfigAct)
+##
## self.__menus["main"] = menu
##
- menu.aboutToShow.connect(self.__aboutToShowMenu)
-
- return menu
-
- def __aboutToShowMenu(self):
- """
- Private slot to set the action enabled status.
- """
- enable = bool(Preferences.getPip("CurrentEnvironment"))
- for act in self.actions:
- if act not in [self.selectEnvironmentAct,
- self.installPipAct,
- self.editUserConfigAct,
- self.editVirtualenvConfigAct,
- self.pipConfigAct]:
- act.setEnabled(enable)
+## menu.aboutToShow.connect(self.__aboutToShowMenu)
+##
+## return menu
+##
+## def __aboutToShowMenu(self):
+## """
+## Private slot to set the action enabled status.
+## """
+## enable = bool(Preferences.getPip("CurrentEnvironment"))
+## for act in self.actions:
+## if act not in [self.selectEnvironmentAct,
+## self.installPipAct,
+## self.editUserConfigAct,
+## self.editVirtualenvConfigAct,
+## self.pipConfigAct]:
+## act.setEnabled(enable)
##
## def getMenu(self, name):
## """
@@ -538,6 +538,7 @@
# Unix, OS X: $VIRTUAL_ENV/pip.conf
# Windows: %VIRTUAL_ENV%\pip.ini
+ # TODO: modify to use venvName
if Globals.isWindowsPlatform():
pip = "pip.ini"
else:
@@ -688,88 +689,84 @@
## self.__listOutdatedDialog.show()
## self.__listOutdatedDialog.start()
##
- def __editUserConfiguration(self):
- """
- Private slot to edit the user configuration.
- """
- self.__editConfiguration()
-
- def __editVirtualenvConfiguration(self):
- """
- Private slot to edit the current virtualenv configuration.
- """
- self.__editConfiguration(virtualenv=True)
-
- def __editConfiguration(self, virtualenv=False):
+## def __editUserConfiguration(self):
+## """
+## Private slot to edit the user configuration.
+## """
+## self.__editConfiguration()
+##
+## def __editVirtualenvConfiguration(self):
+## """
+## Private slot to edit the current virtualenv configuration.
+## """
+## self.__editConfiguration(virtualenv=True)
+##
+## def __editConfiguration(self, virtualenv=False):
+## """
+## Private method to edit a configuration.
+##
+## @param virtualenv flag indicating to edit the current virtualenv
+## configuration file
+## @type bool
+## """
+## from QScintilla.MiniEditor import MiniEditor
+## if virtualenv:
+## cfgFile = self.__getVirtualenvConfig()
+## if not cfgFile:
+## return
+## else:
+## cfgFile = self.__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"""))
+## 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"""))
+## return
+##
+## if not os.path.exists(cfgFile):
+## try:
+## f = open(cfgFile, "w")
+## f.write("[global]\n")
+## f.close()
+## except (IOError, OSError):
+## # ignore these
+## pass
+##
+## # check, if the destination is writeable
+## 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"""))
+## return
+##
+## self.__editor = MiniEditor(cfgFile, "Properties")
+## self.__editor.show()
+##
+ def installPip(self, venvName, userSite=False):
"""
- Private method to edit a configuration.
-
- @param virtualenv flag indicating to edit the current virtualenv
- configuration file
- @type bool
- """
- from QScintilla.MiniEditor import MiniEditor
- if virtualenv:
- cfgFile = self.__getVirtualenvConfig()
- if not cfgFile:
- return
- else:
- cfgFile = self.__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"""))
- return
+ Public method to install pip.
- 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"""))
- return
-
- if not os.path.exists(cfgFile):
- try:
- f = open(cfgFile, "w")
- f.write("[global]\n")
- f.close()
- except (IOError, OSError):
- # ignore these
- pass
-
- # check, if the destination is writeable
- 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"""))
- return
-
- self.__editor = MiniEditor(cfgFile, "Properties")
- self.__editor.show()
-
- def __installPip(self, userSite=False):
- """
- Private slot to install pip.
-
+ @param venvName name of the environment to install pip into
+ @type str
@param userSite flag indicating an install to the user install
directory
@type bool
"""
- from .PipSelectionDialog import PipSelectionDialog
- dlg = PipSelectionDialog(self)
- if dlg.exec_() != QDialog.Accepted:
- return
-
- venvName, userSite = dlg.getData()
interpreter = self.getVirtualenvInterpreter(venvName)
if not interpreter:
return
@@ -794,64 +791,60 @@
if res:
dia.exec_()
+## @pyqtSlot()
+## def upgradePip(self, venvName="", userSite=False):
+## """
+## Public method to upgrade pip itself.
+##
+## @param venvName name of the virtual environment to be used
+## @type str
+## @param userSite flag indicating an install to the user install
+## directory
+## @type bool
+## @return flag indicating a successful execution
+## @rtype bool
+## """
+## # Upgrading pip needs to be treated specially because
+## # it must be done using the python executable
+##
+## if not venvName:
+## from .PipSelectionDialog import PipSelectionDialog
+## dlg = PipSelectionDialog(self)
+## if dlg.exec_() != QDialog.Accepted:
+## return
+##
+## venvName, userSite = dlg.getData()
+##
+## interpreter = self.getVirtualenvInterpreter(venvName)
+## if not interpreter:
+## return
+##
+## if Preferences.getPip("PipSearchIndex"):
+## indexUrl = Preferences.getPip("PipSearchIndex") + "/simple"
+## args = ["-m", "pip", "install", "--index-url", indexUrl,
+## "--upgrade"]
+## else:
+## args = ["-m", "pip", "install", "--upgrade"]
+## if userSite:
+## args.append("--user")
+## args.append("pip")
+##
+## dia = PipDialog(self.tr('Upgrade PIP'))
+## res = dia.startProcess(interpreter, args)
+## if res:
+## dia.exec_()
+## return res
+##
@pyqtSlot()
- def upgradePip(self, venvName="", userSite=False):
+ def repairPip(self, venvName):
"""
- Public method to upgrade pip itself.
+ Public method to repair the pip installation.
- @param venvName name of the virtual environment to be used
+ @param venvName name of the environment to install pip into
@type str
- @param userSite flag indicating an install to the user install
- directory
- @type bool
@return flag indicating a successful execution
@rtype bool
"""
- # Upgrading pip needs to be treated specially because
- # it must be done using the python executable
-
- if not venvName:
- from .PipSelectionDialog import PipSelectionDialog
- dlg = PipSelectionDialog(self)
- if dlg.exec_() != QDialog.Accepted:
- return
-
- venvName, userSite = dlg.getData()
-
- interpreter = self.getVirtualenvInterpreter(venvName)
- if not interpreter:
- return
-
- if Preferences.getPip("PipSearchIndex"):
- indexUrl = Preferences.getPip("PipSearchIndex") + "/simple"
- args = ["-m", "pip", "install", "--index-url", indexUrl,
- "--upgrade"]
- else:
- args = ["-m", "pip", "install", "--upgrade"]
- if userSite:
- args.append("--user")
- args.append("pip")
-
- dia = PipDialog(self.tr('Upgrade PIP'))
- res = dia.startProcess(interpreter, args)
- if res:
- dia.exec_()
- return res
-
- @pyqtSlot()
- def __repairPip(self):
- """
- Private method to repair the pip installation.
-
- @return flag indicating a successful execution
- @rtype bool
- """
- from .PipSelectionDialog import PipSelectionDialog
- dlg = PipSelectionDialog(self)
- if dlg.exec_() != QDialog.Accepted:
- return False
-
- venvName, userSite = dlg.getData()
interpreter = self.getVirtualenvInterpreter(venvName)
if not interpreter:
return
@@ -863,8 +856,6 @@
"--ignore-installed"]
else:
args = ["-m", "pip", "install", "--ignore-installed"]
- if userSite:
- args.append("--user")
args.append("pip")
dia = PipDialog(self.tr('Repair PIP'))
@@ -978,31 +969,31 @@
res = dia.startProcess(interpreter, args)
if res:
dia.exec_()
-
- def __installPackages(self):
- """
- Private slot to install packages to be given by the user.
- """
- from .PipPackagesInputDialog import PipPackagesInputDialog
- dlg = PipPackagesInputDialog(
- self, self.tr("Install Packages"))
- if dlg.exec_() == QDialog.Accepted:
- venvName, packages, user = dlg.getData()
- if packages:
- self.installPackages(packages, venvName=venvName,
- userSite=user)
-
- 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:
- venvName, package, user = dlg.getData()
- if package and os.path.exists(package):
- self.installPackages([package], venvName=venvName,
- userSite=user)
+##
+## def __installPackages(self):
+## """
+## Private slot to install packages to be given by the user.
+## """
+## from .PipPackagesInputDialog import PipPackagesInputDialog
+## dlg = PipPackagesInputDialog(
+## self, self.tr("Install Packages"))
+## if dlg.exec_() == QDialog.Accepted:
+## venvName, packages, user = dlg.getData()
+## if packages:
+## self.installPackages(packages, venvName=venvName,
+## userSite=user)
+##
+## 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:
+## venvName, package, user = dlg.getData()
+## if package and os.path.exists(package):
+## self.installPackages([package], venvName=venvName,
+## userSite=user)
def __installRequirements(self):
"""
@@ -1064,18 +1055,18 @@
dia.exec_()
return res
- def __uninstallPackages(self):
- """
- Private slot to uninstall packages to be given by the user.
- """
- from .PipPackagesInputDialog import PipPackagesInputDialog
- dlg = PipPackagesInputDialog(
- self, self.tr("Uninstall Packages"), install=False)
- if dlg.exec_() == QDialog.Accepted:
- venvName, packages, _user = dlg.getData()
- if packages:
- self.uninstallPackages(packages, venvName=venvName)
-
+## def __uninstallPackages(self):
+## """
+## Private slot to uninstall packages to be given by the user.
+## """
+## from .PipPackagesInputDialog import PipPackagesInputDialog
+## dlg = PipPackagesInputDialog(
+## self, self.tr("Uninstall Packages"), install=False)
+## if dlg.exec_() == QDialog.Accepted:
+## venvName, packages, _user = dlg.getData()
+## if packages:
+## self.uninstallPackages(packages, venvName=venvName)
+##
def __uninstallRequirements(self):
"""
Private slot to uninstall packages as given in a requirements file.
@@ -1115,15 +1106,15 @@
if res:
dia.exec_()
- def __generateRequirements(self):
- """
- Private slot to generate the contents for a requirements file.
- """
- from .PipFreezeDialog import PipFreezeDialog
- self.__freezeDialog = PipFreezeDialog(self)
- self.__freezeDialog.show()
- self.__freezeDialog.start()
-
+## def __generateRequirements(self):
+## """
+## Private slot to generate the contents for a requirements file.
+## """
+## from .PipFreezeDialog import PipFreezeDialog
+## self.__freezeDialog = PipFreezeDialog(self)
+## self.__freezeDialog.show()
+## self.__freezeDialog.start()
+##
## def __searchPyPI(self):
## """
## Private slot to search the Python Package Index.
@@ -1280,9 +1271,9 @@
))
return packages
-
- def __pipConfigure(self):
- """
- Private slot to open the configuration page.
- """
- e5App().getObject("UserInterface").showPreferences("pipPage")
+##
+## def __pipConfigure(self):
+## """
+## Private slot to open the configuration page.
+## """
+## e5App().getObject("UserInterface").showPreferences("pipPage")
