eric: comparison scripts/install.py

-:fb0ef164f536
+:698ae46f40a4
 import io
 import json
 import shlex
 import datetime
 import getpass
+import contextlib
 # Define the globals.
 progName = None
 currDir = os.getcwd()
 modDir = None
 global currDir
 print()
 if sys.platform.startswith(("win", "cygwin")):
-try:
+with contextlib.suppress():
 input("Press enter to continue...")             # secok
-except (EOFError, SyntaxError):
-pass
 os.chdir(currDir)
 sys.exit(rcode)
 try:
 from PyQt5.QtCore import QLibraryInfo
 qtDataDir = QLibraryInfo.location(QLibraryInfo.DataPath)
 except ImportError:
 qtDataDir = None
-if qtDataDir:
+apisDir = os.path.join(qtDataDir, "qsci", "api") if qtDataDir else None
-apisDir = os.path.join(qtDataDir, "qsci", "api")
-else:
-apisDir = None
 def copyToFile(name, text):
 """
 Copy a string to a file.
 @param dname name of the directory to place the wrapper into
 @param wfile basename (without extension) of the wrapper script
 @return the names of the wrapper scripts
 """
-if sys.platform.startswith(("win", "cygwin")):
+wnames = (
-wnames = (dname + "\\" + wfile + ".cmd",
+(dname + "\\" + wfile + ".cmd", dname + "\\" + wfile + ".bat")
-dname + "\\" + wfile + ".bat")
+if sys.platform.startswith(("win", "cygwin")) else
-else:
+(dname + "/" + wfile, )
-wnames = (dname + "/" + wfile, )
+)
 return wnames
 def createPyWrapper(pydir, wfile, saveDir, isGuiScript=True):
 os.path.join(getConfig('ericTranslationsDir'), 'eric6_*.qm')):
 if os.path.exists(name):
 os.remove(name)
 # Cleanup API files
-try:
+with contextlib.suppress(AttributeError):
 apidir = getConfig('apidir')
 for progLanguage in progLanguages:
 for name in getConfig('apis'):
 apiname = os.path.join(apidir, progLanguage.lower(), name)
 if os.path.exists(apiname):
 os.remove(apiname)
 for apiname in glob.glob(
 os.path.join(apidir, progLanguage.lower(), "*.bas")):
 if os.path.basename(apiname) != "eric6.bas":
 os.remove(apiname)
-except AttributeError:
-pass
 if sys.platform == "darwin":
 # delete the Mac app bundle
 cleanUpMacAppBundle()
 except OSError as msg:
 def cleanUpLinuxSpecifics():
 """
 Clean up Linux specific files.
 """
 if os.getuid() == 0:
-for name in ["/usr/share/pixmaps/eric.png",
-"/usr/share/pixmaps/ericWeb.png"]:
-if os.path.exists(name):
-os.remove(name)
 for name in [
 "/usr/share/applications/eric6.desktop",
 "/usr/share/appdata/eric6.appdata.xml",
 "/usr/share/metainfo/eric6.appdata.xml",
 "/usr/share/applications/eric6_browser.desktop",
 "/usr/share/pixmaps/eric.png",
 "/usr/share/pixmaps/ericWeb.png",
+"/usr/share/icons/eric.png",
+"/usr/share/icons/ericWeb.png",
 # from Python2 era
 "/usr/share/applications/eric6_webbrowser.desktop",
 ]:
 if os.path.exists(name):
 os.remove(name)
 elif os.getuid() >= 1000:
 # it is assumed that user ids start at 1000
-for name in ["~/.local/share/pixmaps/eric.png",
-"~/.local/share/pixmaps/ericWeb.png"]:
-path = os.path.expanduser(name)
-if os.path.exists(path):
-os.remove(path)
 for name in [
 "~/.local/share/applications/eric6.desktop",
 "~/.local/share/appdata/eric6.appdata.xml",
 "~/.local/share/metainfo/eric6.appdata.xml",
 "~/.local/share/applications/eric6_browser.desktop",
 "~/.local/share/pixmaps/eric.png",
 "~/.local/share/pixmaps/ericWeb.png",
+"~/.local/share/icons/eric.png",
+"~/.local/share/icons/ericWeb.png",
 # from Python2 era
 "/usr/share/applications/eric6_webbrowser.desktop",
 ]:
 path = os.path.expanduser(name)
 if os.path.exists(path):
 os.path.join(distDir, cfg[key].lstrip(os.sep)))
 try:
 # Install the files
 # make the install directories
-for key in cfg.keys():
+for key in cfg:
 if cfg[key] and not os.path.isdir(cfg[key]):
 os.makedirs(cfg[key])
 # copy the eric config file
 if distDir:
 Install Linux specific files.
 """
 global distDir, sourceDir
 if distDir:
-dst = os.path.normpath(os.path.join(distDir, "usr/share/pixmaps"))
+dst = os.path.normpath(os.path.join(distDir, "usr/share/icons"))
 if not os.path.exists(dst):
 os.makedirs(dst)
 shutilCopy(
 os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
 os.path.join(dst, "eric.png"))
 os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
 os.path.join(dst, "eric6.appdata.xml"))
 elif os.getuid() == 0:
 shutilCopy(
 os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
-"/usr/share/pixmaps/eric.png")
+"/usr/share/icons/eric.png")
 copyDesktopFile(
 os.path.join(sourceDir, "linux", "eric6.desktop.in"),
 "/usr/share/applications/eric6.desktop")
 if os.path.exists("/usr/share/metainfo"):
 copyAppStreamFile(
 copyAppStreamFile(
 os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
 "/usr/share/appdata/eric6.appdata.xml")
 shutilCopy(
 os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
-"/usr/share/pixmaps/ericWeb.png")
+"/usr/share/icons/ericWeb.png")
 copyDesktopFile(
 os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
 "/usr/share/applications/eric6_browser.desktop")
 elif os.getuid() >= 1000:
 # it is assumed, that user ids start at 1000
 localPath = os.path.join(os.path.expanduser("~"),
 ".local", "share")
 # create directories first
 for directory in [os.path.join(localPath, name)
-for name in ("pixmaps", "applications",
+for name in ("icons", "applications",
 "metainfo", "appdata")]:
 if not os.path.isdir(directory):
 os.makedirs(directory)
 # now copy the files
 shutilCopy(
 os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
-os.path.join(localPath, "pixmaps", "eric.png"))
+os.path.join(localPath, "icons", "eric.png"))
 copyDesktopFile(
 os.path.join(sourceDir, "linux", "eric6.desktop.in"),
 os.path.join(localPath, "applications", "eric6.desktop"))
 copyAppStreamFile(
 os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
 copyAppStreamFile(
 os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
 os.path.join(localPath, "appdata", "eric6.appdata.xml"))
 shutilCopy(
 os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
-os.path.join(localPath, "pixmaps", "ericWeb.png"))
+os.path.join(localPath, "icons", "ericWeb.png"))
 copyDesktopFile(
 os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
 os.path.join(localPath, "applications", "eric6_browser.desktop"))
 # check, if pywin32 is available
 from win32com.client import Dispatch    # __IGNORE_WARNING__
 except ImportError:
 installed = pipInstall(
 "pywin32",
-"\nThe Python package 'pywin32' could not be imported."
+"\nThe Python package 'pywin32' could not be imported.",
+force=False
 )
 if installed:
 # create the links via an external script to get around some
 # startup magic done by pywin32.pth
 args = [
 for apiName in sorted(
 glob.glob(os.path.join(eric6SourceDir, "APIs",
 "MicroPython", "*.api"))):
 apis.append(os.path.basename(apiName))
-if sys.platform == "darwin":
+macConfig = (
-macConfig = (
+("""    'macAppBundlePath': r'{0}',\n"""
-"""    'macAppBundlePath': r'{0}',\n"""
+"""    'macAppBundleName': r'{1}',\n""").format(macAppBundlePath,
-"""    'macAppBundleName': r'{1}',\n"""
+macAppBundleName)
-).format(macAppBundlePath, macAppBundleName)
+if sys.platform == "darwin" else
-else:
+""
-macConfig = ""
+)
 config = (
 """# -*- coding: utf-8 -*-\n"""
 """#\n"""
 """# This module contains the configuration of the individual eric"""
 """ installation\n"""
 installInfo["exe_edited"] = False
 installInfo["argv_edited"] = False
 installInfo["eric_edited"] = False
-def pipInstall(packageName, message):
+def pipInstall(packageName, message, force=True):
 """
 Install the given package via pip.
 @param packageName name of the package to be installed
 @type str
 @param message message to be shown to the user
 @type str
+@param force flag indicating to perform the installation
+without asking the user
+@type bool
 @return flag indicating a successful installation
 @rtype bool
 """
 global yes2All
 ok = False
-if yes2All:
+if yes2All or force:
 answer = "y"
 else:
 print("{0}\n\nShall '{1}' be installed using pip? (Y/n)"
 .format(message, packageName), end=" ")
 answer = input()                            # secok
 def doDependancyChecks():
 """
 Perform some dependency checks.
 """
 try:
-isSudo = os.getuid() == 0
+isSudo = os.getuid() == 0 and sys.platform != "darwin"
+# disregard sudo installs on macOS
 except AttributeError:
 isSudo = False
 print('Checking dependencies')
 try:
 from PyQt5.QtCore import qVersion
 except ImportError as msg:
 installed = not isSudo and pipInstall(
-"PyQt5>=5.12.1,<5.15.2",
+"PyQt5>=5.12.1",
 "'PyQt5' could not be detected.\nError: {0}".format(msg)
 )
 if installed:
 # try to import it again
 try:
 # PyQt 5.12 separated QtWebEngine into a separate wheel
 if isSudo:
 print("Optional 'PyQtWebEngine' could not be detected.")
 else:
 pipInstall(
-"PyQtWebEngine>=5.12.1,<5.15.2",
+"PyQtWebEngine>=5.12.1",
 "Optional 'PyQtWebEngine' could not be detected.\n"
 "Error: {0}".format(msg)
 )
 try:
 except ImportError as msg:
 if isSudo:
 print("Optional 'PyQtChart' could not be detected.")
 else:
 pipInstall(
-"PyQtChart>=5.12.1,<5.15.2",
+"PyQtChart>=5.12.1",
 "Optional 'PyQtChart' could not be detected.\n"
 "Error: {0}".format(msg)
 )
 try:
 (("PyQt5.QtWebEngineWidgets", ), sys.maxsize <= 2**32),
 ]
 optionalModulesList = {
 # key is pip project name
 # value is tuple of package name, pip install constraint
-"PyYAML": ("yaml", ""),
+"docutils": ("docutils", ""),
+"Markdown": ("markdown", ""),
+"pyyaml": ("yaml", ""),
 "toml": ("toml", ""),
+"chardet": ("chardet", ""),
+"asttokens": ("asttokens", ""),
+"EditorConfig": ("editorconfig", ""),
+"Send2Trash": ("send2trash", ""),
+"Pygments": ("pygments", ""),
 }
 # dict with tuples of package name and install constraint
 if sys.platform != "darwin" and not ignorePyqt5Tools:
 optionalModulesList["qt5-applications"] = ("qt5_applications",
 "<5.15.2")
 altModulesOK = True
 for altModules, forcedOk in altModulesList:
 modulesOK = False
 for altModule in altModules:
 name = altModule.split(".")[1]
-try:
+with contextlib.suppress(ImportError):
 __import__(altModule)
 print("Found", name)
 modulesOK = True
 break
-except ImportError:
-pass
 if not modulesOK and not forcedOk:
 altModulesOK = False
 print('Sorry, please install {0}.'
 .format(" or ".join(altModules)))
 if not altModulesOK:
 if qtMajor == 5 and qtMinor < 12:
 print('Sorry, you must have Qt version 5.12.0 or better.')
 exit(2)
 # check version of sip
-try:
+with contextlib.suppress(ImportError, AttributeError):
 try:
 from PyQt5 import sip
 except ImportError:
 import sip
 sipVersion = sip.SIP_VERSION_STR
 (major, minor, pat) = sipVersion.split('.')
 major = int(major)
 minor = int(minor)
 pat = int(pat)
 if (
-major < 4 or
+major < 5 or
-(major == 4 and minor < 14) or
+(major == 5 and minor < 0) or
-(major == 4 and minor == 14 and pat < 2)
+(major == 5 and minor == 0 and pat < 0)
 ):
-print('Sorry, you must have sip 4.14.2 or higher or'
+print('Sorry, you must have sip 5.0.0 or higher or'
 ' a recent snapshot release.')
 exit(3)
 # check for blacklisted versions
 for vers in BlackLists["sip"] + PlatformBlackLists["sip"]:
 if vers == sipVersion:
 print(
 'Sorry, sip version {0} is not compatible with eric.'
 .format(vers))
 print('Please install another version.')
 exit(3)
-except (ImportError, AttributeError):
-pass
 # check version of PyQt
 from PyQt5.QtCore import PYQT_VERSION_STR
 pyqtVersion = PYQT_VERSION_STR
 print("PyQt Version:", pyqtVersion.strip())
 ' eric.'.format(vers))
 print('Please install another version.')
 exit(5)
 # print version info for additional modules
-try:
+with contextlib.suppress(NameError, AttributeError):
 print("PyQtChart:", QtChart.PYQT_CHART_VERSION_STR)
-except (NameError, AttributeError):
-pass
+with contextlib.suppress(ImportError, AttributeError):
-try:
 from PyQt5 import QtWebEngine
 print("PyQtWebEngine.", QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
-except (ImportError, AttributeError):
-pass
 print("All dependencies ok.")
 print()
 @param fileName name of the Python file containing the info (string)
 """
 if not fileName:
 return
-try:
+with contextlib.suppress(OSError):
 os.rename(fileName, fileName + ".orig")
-except OSError:
-pass
 try:
 hgOut = subprocess.check_output(["hg", "identify", "-i"])   # secok
 hgOut = hgOut.decode()
 except (OSError, subprocess.CalledProcessError):
 hgOut = ""
 @type str
 """
 from win32com.client import Dispatch
 from pywintypes import com_error
-try:
+with contextlib.suppress(com_error):
 shell = Dispatch('WScript.Shell')
 shortcut = shell.CreateShortCut(linkPath)
 shortcut.Targetpath = targetPath
 shortcut.WorkingDirectory = os.path.dirname(targetPath)
 shortcut.IconLocation = iconPath
 shortcut.save()
-except com_error:
-# maybe restrictions prohibited link creation
-pass
 def windowsDesktopNames():
 """
 Function to generate the link names for the Windows Desktop.
 elif opt == "-c":
 doCleanup = False
 elif opt == "-z":
 doCompile = False
 elif opt == "-f":
-try:
+with open(arg) as f:
-exec(compile(open(arg).read(), arg, 'exec'), globals())
+try:
-# secok
+exec(compile(f.read(), arg, 'exec'), globals())
-if len(cfg) != configLength:
+# secok
-print("The configuration dictionary in '{0}' is incorrect."
+if len(cfg) != configLength:
-" Aborting".format(arg))
+print("The configuration dictionary in '{0}' is"
-exit(6)
+" incorrect. Aborting".format(arg))
-except Exception:
+exit(6)
-cfg = {}
+except Exception:
+cfg = {}
 elif opt == "-m":
 macAppBundleName = arg
 elif opt == "-n":
 macAppBundlePath = arg
 elif opt == "-p":
 if len(cfg) == 0:
 createInstallConfig()
 # get rid of development config file, if it exists
-try:
+with contextlib.suppress(OSError):
 if installFromSource:
 os.rename(configName, configName + ".orig")
 configNameC = configName + 'c'
 if os.path.exists(configNameC):
 os.remove(configNameC)
 os.remove(configName)
-except OSError:
-pass
 # cleanup old installation
 print("Cleaning up old installation ...")
 try:
 if doCleanup:
 with open(os.path.join(cfg["ericDir"],
 installInfoName), "w") as installInfoFile:
 json.dump(installInfo, installInfoFile, indent=2)
 # do some cleanup
-try:
+with contextlib.suppress(OSError):
 if installFromSource:
 os.remove(configName)
 configNameC = configName + 'c'
 if os.path.exists(configNameC):
 os.remove(configNameC)
 os.rename(configName + ".orig", configName)
-except OSError:
+with contextlib.suppress(OSError):
-pass
-try:
 if installFromSource and infoName:
 os.remove(infoName)
 infoNameC = infoName + 'c'
 if os.path.exists(infoNameC):
 os.remove(infoNameC)
 os.rename(infoName + ".orig", infoName)
-except OSError:
-pass
 print("\nInstallation complete.")
 print()
 exit(res)

Mercurial Repositories > eric / file comparison

comparison: scripts/install.py

scripts/install.py