eric: comparison scripts/install.py

-:b18ad1f984b1
+:2dc33116df50
 for name in ["LICENSE.txt", "THANKS", "changelog.md", "ThirdParty.md"]:
 try:
 shutilCopy(os.path.join(sourceDir, "docs", name), cfg["ericDocDir"])
 except OSError:
 print(
-"Could not install '{0}'.".format(os.path.join(sourceDir, "docs", name))
+"\nCould not install '{0}'.".format(os.path.join(sourceDir, "docs", name))
 )
 for name in glob.glob(os.path.join(sourceDir, "docs", "README*.*")):
 try:
 shutilCopy(name, cfg["ericDocDir"])
 except OSError:
-print("Could not install '{0}'.".format(name))
+print("\nCould not install '{0}'.".format(name))
 # copy some more stuff
 for name in ("default.ekj", "default_Mac.ekj", "default.e4k", "default_Mac.e4k"):
 try:
 shutilCopy(os.path.join(sourceDir, "others", name), cfg["ericOthersDir"])
 except OSError:
 print(
-"Could not install '{0}'.".format(
+"\nCould not install '{0}'.".format(
 os.path.join(sourceDir, "others", name)
 )
 )
 # install the API file
 if installApis:
 if os.access(cfg["apidir"], os.W_OK):
 for progLanguage in progLanguages:
 apidir = os.path.join(cfg["apidir"], progLanguage)
-print("Installing {0} API files to '{1}'.".format(progLanguage, apidir))
+print(
+"\nInstalling {0} API files to '{1}'.".format(progLanguage, apidir)
+)
 if not os.path.exists(apidir):
 os.makedirs(apidir)
 for apiName in glob.glob(
 os.path.join(eric7SourceDir, "APIs", progLanguage, "*.api")
 ):
 for apiName in glob.glob(
 os.path.join(eric7SourceDir, "APIs", progLanguage, "*.bas")
 ):
 shutilCopy(apiName, apidir)
 else:
-print("The API directory '{0}' is not writable.".format(cfg["apidir"]))
+print("\nThe API directory '{0}' is not writable.".format(cfg["apidir"]))
 print("Use the API files provided by the 'API Files' plug-in.")
 # Create menu entry for Linux systems
 if sys.platform.startswith("linux"):
 createLinuxSpecifics()
 except ImportError:
 print("Your Python installation is missing the XML module.")
 print("Please install it and try again.")
 exit(5)
+print("PyQt & Qt")
+print("---------")
 try:
 from PyQt6.QtCore import qVersion
 except ImportError as err:
 msg = "'PyQt6' could not be detected.{0}".format(
 "\nError: {0}".format(err) if verbose else ""
 "PyQt6-WebEngine>={0}".format(
 versionToStr(requiredVersions["pyqt6-webengine"])
 ),
 msg,
 )
+print("Found PyQt6-WebEngine")
 try:
 from PyQt6 import QtCharts  # __IGNORE_WARNING__
 except ImportError as err:
 if isSudo:
 "cyclonedx-python-lib": ("cyclonedx", ""),
 "cyclonedx-bom": ("cyclonedx_py", ""),
 "trove-classifiers": ("trove_classifiers", ""),
 "black": ("black", ">=22.6.0"),
 "isort": ("isort", ">=5.10.0"),
+"coverage": ("coverage", ">=6.5.0"),
 }
 optionalModulesList = {
 # key is pip project name
 # value is tuple of package name, pip install constraint
 "docutils": ("docutils", ""),
 if withPyqt6Tools:
 optionalModulesList["qt6-applications"] = ("qt6_applications", "")
 # check mandatory PyQt6 modules
 modulesOK = True
-for pyqt6BaseModule in pyqt6BaseModulesList:
+for pyqt6BaseModule in sorted(pyqt6BaseModulesList):
 name = pyqt6BaseModule.split(".")[1]
 try:
 importlib.import_module(pyqt6BaseModule)
 print("Found", name)
 except ImportError as err:
 modulesOK = False
 if not modulesOK:
 exit(1)
 # check required modules
+print("\nRequired Packages")
+print("-----------------")
 requiredMissing = False
-for requiredPackage in requiredModulesList:
+for requiredPackage in sorted(requiredModulesList):
 try:
 importlib.import_module(requiredModulesList[requiredPackage][0])
 print("Found", requiredPackage)
 except ImportError as err:
 if isSudo:
 print("Some required packages are missing and could not be installed.")
 print("Install them manually with:")
 print("    {0} install-dependencies.py --required".format(sys.executable))
 # check optional modules
+print("\nOptional Packages")
+print("-----------------")
 optionalMissing = False
-for optPackage in optionalModulesList:
+for optPackage in sorted(optionalModulesList):
 try:
 importlib.import_module(optionalModulesList[optPackage][0])
 print("Found", optPackage)
 except ImportError as err:
 if isSudo:
 else os.path.join(sourceDir, "eric7")
 )
 # cleanup source if installing from source
 if installFromSource:
-print("Cleaning up source ...")
+print("Cleaning up source ...", end="")
 cleanupSource(sourceDir)
-print()
+print(" Done")
 configName = os.path.join(eric7SourceDir, "eric7config.py")
 if os.path.exists(os.path.join(sourceDir, ".hg")):
 # we are installing from source with repo
 infoName = os.path.join(eric7SourceDir, "UI", "Info.py")
 if os.path.exists(configNameC):
 os.remove(configNameC)
 os.remove(configName)
 # cleanup old installation
-print("Cleaning up old installation ...")
+print("Cleaning up old installation ...", end="")
 try:
 if doCleanup:
 if distDir:
 shutil.rmtree(distDir, True)
 else:
 cleanUp()
 except OSError as msg:
-sys.stderr.write("Error: {0}\nTry install as root.\n".format(msg))
+sys.stderr.write("\nError: {0}\nTry install as root.\n".format(msg))
 exit(7)
+print(" Done")
 # Create a config file and delete the default one
-print("\nCreating configuration file ...")
+print("Creating configuration file ...", end="")
 createConfig()
+print(" Done")
+# Create an install info file
+print("Creating an install info file ...", end="")
 createInstallInfo()
+print(" Done")
 # Compile .ui files
-print("\nCompiling user interface files ...")
+print("Compiling user interface files ...", end="")
 # step 1: remove old Ui_*.py files
 for root, _, files in os.walk(sourceDir):
 for file in [f for f in files if fnmatch.fnmatch(f, "Ui_*.py")]:
 os.remove(os.path.join(root, file))
 # step 2: compile the forms
 compileUiFiles()
+print(" Done")
 if doCompile:
-print("\nCompiling source files ...")
+print("Compiling source files ...", end="")
 skipRe = re.compile(r"DebugClients[\\/]Python[\\/]")
 sys.stdout = io.StringIO()
 if distDir:
 compileall.compile_dir(
 eric7SourceDir,
 rx=skipRe,
 quiet=True,
 )
 py_compile.compile(configName, dfile=os.path.join(modDir, "eric7config.py"))
 sys.stdout = sys.__stdout__
-print("\nInstalling eric ...")
+print(" Done")
+print("Installing eric ...", end="")
 res = installEric()
+print(" Done")
 if createInstallInfoFile:
 with open(
 os.path.join(cfg["ericDir"], installInfoName), "w"
 ) as installInfoFile:

Mercurial Repositories > eric / file comparison

comparison: scripts/install.py

scripts/install.py