eric: comparison scripts/install.py

-:e8dd241cbfef
+:8fbaa183c41e
 doCleanDesktopLinks = False
 forceCleanDesktopLinks = False
 doCompile = True
 yes2All = False
 ignorePyqt6Tools = False
+verbose = False
 cfg = {}
 progLanguages = ["Python", "Ruby", "QSS"]
 sourceDir = "eric"
 eric7SourceDir = os.path.join(sourceDir, "eric7")
 configName = 'eric7config.py'
 global macAppBundleName, macAppBundlePath, macPythonExe
 print()
 print("Usage:")
 if sys.platform == "darwin":
-print("    {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
+print("    {0} [-chvxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
-" [-m name] [-n path] [-p python] [--no-apis] [--no-info]"
+" [-m name] [-n path] [-p python] [--help] [--no-apis]"
-" [--no-tools] [--yes]"
+" [--no-info] [--no-tools] [--verbose] [--yes]"
 .format(progName))
 elif sys.platform.startswith(("win", "cygwin")):
-print("    {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file]"
+print("    {0} [-chvxz] [-a dir] [-b dir] [-d dir] [-f file]"
-" [--clean-desktop] [--no-apis] [--no-info] [--no-tools] [--yes]"
+" [--clean-desktop] [--help] [--no-apis] [--no-info]"
+" [--no-tools] [--verbose] [--yes]"
 .format(progName))
 else:
-print("    {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
+print("    {0} [-chvxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
-" [--no-apis] [--no-info] [--no-tools] [--yes]"
+" [--help] [--no-apis] [--no-info] [--no-tools] [--verbose]"
+" [--yes]"
 .format(progName))
 print("where:")
 print("    -h, --help display this help message")
 print("    -a dir     where the API files will be installed")
 if apisDir:
 print("    -c         don't cleanup old installation first")
 if sys.platform.startswith(("win", "cygwin")):
 print("    --clean-desktop delete desktop links before installation")
 print("    --no-info  don't create the install info file")
 print("    --no-tools don't install qt6-applications")
+print("    -v, --verbose print some more information")
 print("    -x         don't perform dependency checks (use on your own"
 " risk)")
 print("    -z         don't compile the installed python files")
 print("    --yes      answer 'yes' to all questions")
 print()
 ok = False
 if yes2All or force:
 answer = "y"
 else:
-print("{0}\n\nShall '{1}' be installed using pip? (Y/n)"
+print("{0}\nShall '{1}' be installed using pip? (Y/n)"
 .format(message, packageName), end=" ")
 answer = input()                            # secok
 if answer in ("", "Y", "y"):
 exitCode = subprocess.call(                 # secok
 [sys.executable, "-m", "pip", "install", "--prefer-binary",
 def doDependancyChecks():
 """
 Perform some dependency checks.
 """
+global verbose
 # TODO: update as necessary for PyQt6 6.2.0
 requiredVersions = {
 "pyqt6": 0x60101,
 "pyqt6-charts": 0x60101,
 "pyqt6-webengine": 0x60200,
 print('Please install it and try again.')
 exit(5)
 try:
 from PyQt6.QtCore import qVersion
-except ImportError as msg:
+except ImportError as err:
+msg = "'PyQt6' could not be detected.{0}".format(
+"\nError: {0}".format(err) if verbose else "")
 installed = not isSudo and pipInstall(
 "PyQt6>={0}".format(versionToStr(requiredVersions["pyqt6"])),
-"'PyQt6' could not be detected.\nError: {0}".format(msg)
+msg
 )
 if installed:
 # try to import it again
 try:
 from PyQt6.QtCore import qVersion
 print("Found PyQt6")
 try:
 pyuic = "pyuic6"
 from PyQt6 import uic      # __IGNORE_WARNING__
-except ImportError as msg:
+except ImportError as err:
 print("Sorry, {0} is not installed.".format(pyuic))
-print('Error: {0}'.format(msg))
+if verbose:
+print('Error: {0}'.format(err))
 exit(1)
 print("Found {0}".format(pyuic))
 try:
 from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
-except ImportError as msg:
+except ImportError as err:
 if isSudo:
 print("Optional 'PyQt6-WebEngine' could not be detected.")
 else:
 # TODO: should PyQt6-WebEngine be a must requirement?
+msg = (
+"Optional 'PyQt6-WebEngine' could not be detected.{0}"
+.format("\nError: {0}".format(err) if verbose else "")
+)
 pipInstall(
 "PyQt6-WebEngine>={0}".format(
 versionToStr(requiredVersions["pyqt6-webengine"])),
-"Optional 'PyQt6-WebEngine' could not be detected.\n"
+msg,
-"Error: {0}".format(msg),
 force=False
 )
 try:
 from PyQt6 import QtCharts    # __IGNORE_WARNING__
-except ImportError as msg:
+except ImportError as err:
 if isSudo:
 print("Optional 'PyQt6-Charts' could not be detected.")
 else:
+msg = "Optional 'PyQt6-Charts' could not be detected.{0}".format(
+"\nError: {0}".format(err) if verbose else "")
 pipInstall(
 "PyQt6-Charts>={0}".format(
 versionToStr(requiredVersions["pyqt6-charts"])),
-"Optional 'PyQt6-Charts' could not be detected.\n"
+msg
-"Error: {0}".format(msg)
 )
 print("Found PyQt6-Charts")
 try:
 from PyQt6 import Qsci      # __IGNORE_WARNING__
-except ImportError as msg:
+except ImportError as err:
+msg = "'PyQt6-QScintilla' could not be detected.{0}".format(
+"\nError: {0}".format(err) if verbose else "")
 installed = not isSudo and pipInstall(
 "PyQt6-QScintilla>={0}".format(
 versionToStr(requiredVersions["pyqt6-qscintilla"])),
-"'PyQt6-QScintilla' could not be detected.\nError: {0}".format(msg)
+msg
 )
 if installed:
 # try to import it again
 try:
 from PyQt6 import Qsci      # __IGNORE_WARNING__
 for impModule in impModulesList:
 name = impModule.split(".")[1]
 try:
 __import__(impModule)
 print("Found", name)
-except ImportError as msg:
+except ImportError as err:
 print('Sorry, please install {0}.'.format(name))
-print('Error: {0}'.format(msg))
+if verbose:
+print('Error: {0}'.format(err))
 modulesOK = False
 if not modulesOK:
 exit(1)
 # check optional modules
 for optPackage in optionalModulesList:
 try:
 __import__(optionalModulesList[optPackage][0])
 print("Found", optPackage)
-except ImportError as msg:
+except ImportError as err:
 if isSudo:
 print("Optional '{0}' could not be detected."
 .format(optPackage))
 else:
+msg = "Optional '{0}' could not be detected.{1}".format(
+optPackage,
+"\nError: {0}".format(err) if verbose else ""
+)
 pipInstall(
 optPackage + optionalModulesList[optPackage][1],
-"Optional '{0}' could not be detected.\n"
+msg
-"Error: {1}".format(optPackage, msg)
 )
 # determine the platform dependent black list
 if sys.platform.startswith(("win", "cygwin")):
 PlatformBlackLists = PlatformsBlackLists["windows"]
 global sourceDir, eric7SourceDir, configName
 global macAppBundlePath, macAppBundleName, macPythonExe
 global installApis, doCleanDesktopLinks, yes2All
 global createInstallInfoFile, installCwd
 global ignorePyqt6Tools
+global verbose
 if sys.version_info < (3, 6, 0) or sys.version_info > (3, 99, 99):
 print('Sorry, eric requires at least Python 3.6 for running.')
 exit(5)
 initGlobals()
 try:
 if sys.platform.startswith(("win", "cygwin")):
 optlist, args = getopt.getopt(
-argv[1:], "chxza:b:d:f:",
+argv[1:], "chvxza:b:d:f:",
-["help", "no-apis", "no-info", "no-tools", "yes"])
+["help", "no-apis", "no-info", "no-tools", "verbose", "yes"])
 elif sys.platform == "darwin":
 optlist, args = getopt.getopt(
-argv[1:], "chxza:b:d:f:i:m:n:p:",
+argv[1:], "chvxza:b:d:f:i:m:n:p:",
-["help", "no-apis", "no-info", "no-tools", "yes"])
+["help", "no-apis", "no-info", "no-tools", "verbose", "yes"])
 else:
 optlist, args = getopt.getopt(
-argv[1:], "chxza:b:d:f:i:",
+argv[1:], "chvxza:b:d:f:i:",
-["help", "no-apis", "no-info", "no-tools", "yes"])
+["help", "no-apis", "no-info", "no-tools", "verbose", "yes"])
 except getopt.GetoptError as err:
 print(err)
 usage()
 global platBinDir
 yes2All = True
 elif opt == "--no-tools":
 ignorePyqt6Tools = True
 elif opt == "--no-info":
 createInstallInfoFile = False
+elif opt in ["-v", "--verbose"]:
+verbose = True
 infoName = ""
 installFromSource = not os.path.isdir(sourceDir)
 # check dependencies

Mercurial Repositories > eric / file comparison

comparison: scripts/install.py

scripts/install.py