PyInstaller Interface: comparison PluginPyInstaller.py

-:9ecfea29a47c
+:fc9ef9dcd51a
 import contextlib
 import os
 import platform
 import shutil
-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
 pyqtSlot, QObject, QCoreApplication, QTranslator, QProcess
 )
-from PyQt5.QtWidgets import QDialog
+from PyQt6.QtWidgets import QDialog
-from E5Gui import E5MessageBox
+from EricWidgets import EricMessageBox
-from E5Gui.E5Action import E5Action
+from EricGui.EricAction import EricAction
-from E5Gui.E5Application import e5App
+from EricWidgets.EricApplication import ericApp
 import Utilities
 # Start-Of-Header
 name = "PyInstaller Plugin"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "2.2.0"
+version = "1.0.0"
 className = "PyInstallerPlugin"
-packageName = "PyInstaller"
+packageName = "PyInstallerInterface"
 shortDescription = "Show dialogs to configure and execute PyInstaller."
 longDescription = (
 """This plug-in implements dialogs to configure and execute PyInstaller"""
 """ for an eric project. PyInstaller must be available or must be"""
 """ installed via 'pip install PyInstaller'."""
 @return names of the executables
 @rtype list of str
 """
 # Determine Python Version
 if majorVersion == 3:
-minorVersions = range(10)
+minorVersions = range(16)
-elif majorVersion == 2:
-minorVersions = [7]     # PyInstaller supports just Python 2.7
 else:
 return []
 executables = set()
 if Utilities.isWindowsPlatform():
 def _checkProgram():
 """
 Restricted function to check the availability of pyinstaller.
-@return flag indicating availability (boolean)
+@return flag indicating availability
+@rtype bool
 """
 global error, exePy3
 exePy3 = _findExecutable(3)
 if not exePy3:
 def activate(self):
 """
 Public method to activate this plug-in.
-@return tuple of None and activation status (boolean)
+@return tuple of None and activation status
+@rtype tuple of (None, bool)
 """
 global error
 # There is already an error, don't activate
 if error:
 return None, False
 # clear previous error
 error = ""
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 menu = project.getMenu("Packagers")
 if menu:
 self.__projectSeparator = menu.addSeparator()
 # Execute PyInstaller
-act = E5Action(
+act = EricAction(
 self.tr('Execute PyInstaller'),
 self.tr('Execute Py&Installer'), 0, 0,
 self, 'packagers_pyinstaller_run')
 act.setStatusTip(
 self.tr('Generate a distribution package using PyInstaller'))
 act.triggered.connect(self.__pyinstaller)
 menu.addAction(act)
 self.__projectActs.append(act)
 # Execute pyi-makespec
-act = E5Action(
+act = EricAction(
 self.tr('Make PyInstaller Spec File'),
 self.tr('Make PyInstaller &Spec File'), 0, 0,
 self, 'packagers_pyinstaller_spec')
 act.setStatusTip(
 self.tr('Generate a spec file to be used by PyInstaller'))
 act.triggered.connect(self.__pyiMakeSpec)
 menu.addAction(act)
 self.__projectActs.append(act)
 # clean the pyinstaller created directories
-act = E5Action(
+act = EricAction(
 self.tr('Clean PyInstaller'),
 self.tr('&Clean PyInstaller'), 0, 0,
 self, 'packagers_pyinstaller_clean')
 act.setStatusTip(
 self.tr('Remove the PyInstaller created directories'))
 ))
 act.triggered.connect(self.__pyinstallerCleanup)
 menu.addAction(act)
 self.__projectActs.append(act)
-project.addE5Actions(self.__projectActs)
+project.addEricActions(self.__projectActs)
 project.showMenu.connect(self.__projectShowMenu)
 return None, True
 def deactivate(self):
 """
 Public method to deactivate this plug-in.
 """
-menu = e5App().getObject("Project").getMenu("Packagers")
+menu = ericApp().getObject("Project").getMenu("Packagers")
 if menu:
 for act in self.__projectActs:
 menu.removeAction(act)
 if self.__projectSeparator:
 menu.removeAction(self.__projectSeparator)
-e5App().getObject("Project").removeE5Actions(
+ericApp().getObject("Project").removeEricActions(
 self.__projectActs)
 self.__initialize()
 def __projectShowMenu(self, menuName, menu):
 @param menu reference to the menu
 @type QMenu
 """
 if menuName == "Packagers":
 enable = (
-e5App().getObject("Project").getProjectLanguage() == "Python3"
+ericApp().getObject("Project").getProjectLanguage() ==
+"Python3"
 )
 for act in self.__projectActs:
 act.setEnabled(enable)
 def __loadTranslator(self):
 """
 if self.__ui is not None:
 loc = self.__ui.getLocale()
 if loc and loc != "C":
 locale_dir = os.path.join(os.path.dirname(__file__),
-"PyInstaller", "i18n")
+"PyInstallerInterface", "i18n")
 translation = "pyinstaller_{0}".format(loc)
 translator = QTranslator(None)
 loaded = translator.load(translation, locale_dir)
 if loaded:
 self.__translator = translator
-e5App().installTranslator(self.__translator)
+ericApp().installTranslator(self.__translator)
 else:
 print("Warning: translation file '{0}' could not be"
 " loaded.".format(translation))
 print("Using default.")
 def __pyinstaller(self):
 """
 Private slot to execute the pyinstaller command for the current
 project.
 """
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 majorVersionStr = project.getProjectLanguage()
 if majorVersionStr == "Python3":
 executables = [f for f in exePy3 if
 f.endswith(("pyinstaller", "pyinstaller.exe"))]
 if not executables:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("pyinstaller"),
 self.tr("""The pyinstaller executable could not be"""
 """ found."""))
 return
 # check if all files saved and errorfree before continue
 if not project.checkAllScriptsDirty(reportSyntaxErrors=True):
 return
-from PyInstaller.PyInstallerConfigDialog import (
+from PyInstallerInterface.PyInstallerConfigDialog import (
 PyInstallerConfigDialog
 )
 params = project.getData('PACKAGERSPARMS', "PYINSTALLER")
 dlg = PyInstallerConfigDialog(project, executables, params,
 mode="installer")
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 args, params, script = dlg.generateParameters()
 project.setData('PACKAGERSPARMS', "PYINSTALLER", params)
 # now do the call
-from PyInstaller.PyInstallerExecDialog import (
+from PyInstallerInterface.PyInstallerExecDialog import (
 PyInstallerExecDialog
 )
 dia = PyInstallerExecDialog("pyinstaller")
 dia.show()
 res = dia.start(args, params, project, script)
 def __pyiMakeSpec(self):
 """
 Private slot to execute the pyi-makespec command for the current
 project to generate a spec file to be used by pyinstaller.
 """
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
 majorVersionStr = project.getProjectLanguage()
 if majorVersionStr == "Python3":
 executables = [f for f in exePy3 if
 f.endswith(("pyi-makespec", "pyi-makespec.exe"))]
 if not executables:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("pyi-makespec"),
 self.tr("""The pyi-makespec executable could not be"""
 """ found."""))
 return
 # check if all files saved and errorfree before continue
 if not project.checkAllScriptsDirty(reportSyntaxErrors=True):
 return
-from PyInstaller.PyInstallerConfigDialog import (
+from PyInstallerInterface.PyInstallerConfigDialog import (
 PyInstallerConfigDialog
 )
 params = project.getData('PACKAGERSPARMS', "PYINSTALLER")
 dlg = PyInstallerConfigDialog(project, executables, params,
 mode="spec")
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 args, params, script = dlg.generateParameters()
 project.setData('PACKAGERSPARMS', "PYINSTALLER", params)
 # now do the call
-from PyInstaller.PyInstallerExecDialog import (
+from PyInstallerInterface.PyInstallerExecDialog import (
 PyInstallerExecDialog
 )
 dia = PyInstallerExecDialog("pyinstaller")
 dia.show()
 res = dia.start(args, params, project, script)
 @pyqtSlot()
 def __pyinstallerCleanup(self):
 """
 Private slot to remove the directories created by pyinstaller.
 """
-project = e5App().getObject("Project")
+project = ericApp().getObject("Project")
-from PyInstaller.PyInstallerCleanupDialog import (
+from PyInstallerInterface.PyInstallerCleanupDialog import (
 PyInstallerCleanupDialog
 )
 dlg = PyInstallerCleanupDialog()
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 removeDirs = dlg.getDirectories()
 for directory in removeDirs:
 rd = os.path.join(project.getProjectPath(), directory)
 shutil.rmtree(rd, ignore_errors=True)
+def installDependencies(pipInstall):
+"""
+Function to install dependencies of this plug-in.
+@param pipInstall function to be called with a list of package names.
+@type function
+"""
+try:
+import PyInstaller         # __IGNORE_WARNING__
+except ImportError:
+pipInstall(["pyinstaller"])
 #
 # eflag: noqa = M801

Mercurial Repositories > PyInstaller Interface / file comparison

comparison: PluginPyInstaller.py

PluginPyInstaller.py