--- a/src/eric7/UI/upgrader.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/UI/upgrader.py Wed Jul 13 14:55:47 2022 +0200 @@ -18,9 +18,14 @@ _pyqtPackages = [ - "pyqt6", "pyqt6-sip", "pyqt6-webengine", "pyqt6-charts", - "pyqt6-qscintilla", "pyqt6-qt6", "pyqt6-webengine-qt6", - "pyqt6-charts-qt6" + "pyqt6", + "pyqt6-sip", + "pyqt6-webengine", + "pyqt6-charts", + "pyqt6-qscintilla", + "pyqt6-qt6", + "pyqt6-webengine-qt6", + "pyqt6-charts-qt6", ] _ericPackages = ["eric-ide"] @@ -28,25 +33,25 @@ def doUpgrade(packages): """ Function to upgrade the given packages via pip. - + @param packages list of packages to be upgraded @type list of str @return flag indicating a successful installation @rtype bool """ - exitCode = subprocess.run( # secok - [sys.executable, "-m", "pip", "install", "--prefer-binary", - "--upgrade"] + packages + exitCode = subprocess.run( # secok + [sys.executable, "-m", "pip", "install", "--prefer-binary", "--upgrade"] + + packages ).returncode - ok = (exitCode == 0) - + ok = exitCode == 0 + return ok def startEric(args): """ Function to start eric with the given arguments. - + @param args list containing the start arguments @type list of str """ @@ -63,27 +68,27 @@ except ValueError: # '--' was not found. Start eric with all parameters given. ddindex = 0 - - ericStartArgs = sys.argv[ddindex + 1:] if bool(ddindex) else [] + + ericStartArgs = sys.argv[ddindex + 1 :] if bool(ddindex) else [] if not ericStartArgs: # create default start arguments ericStartArgs = ["-m", "eric7", "--start-session"] - + upgraderArgs = sys.argv[1:ddindex] if bool(ddindex) else sys.argv[:] - + upgradeType = "" upgradeDelay = 2 - + for arg in upgraderArgs: if arg.startswith("--delay="): with contextlib.suppress(ValueError): upgradeDelay = int(arg.split("=")[1].strip()) elif arg.startswith("--type="): upgradeType = arg.split("=")[1].strip() - + # wait a few seconds to give eric the chance to fully shut down time.sleep(upgradeDelay) - + # now perform the upgrade and start eric, if it was successful if upgradeType == "pyqt": ok = doUpgrade(_pyqtPackages) @@ -93,12 +98,13 @@ ok = doUpgrade(_ericPackages + _pyqtPackages) else: ok = False - + if ok: startEric(ericStartArgs) sys.exit(0) else: sys.exit(1) + if __name__ == "__main__": main()