eric: comparison scripts/install.py

-:0c7a44af84bc
+:962bce857696
 # it's the wheel
 qtDataDir = os.path.join(pyqtDataDir, "Qt")
 else:
 # determine dynamically
 try:
-from PyQt5.QtCore import QLibraryInfo
+from PyQt6.QtCore import QLibraryInfo
-qtDataDir = QLibraryInfo.location(QLibraryInfo.DataPath)
+qtDataDir = QLibraryInfo.path(QLibraryInfo.DataPath)
 except ImportError:
 qtDataDir = None
 apisDir = os.path.join(qtDataDir, "qsci", "api") if qtDataDir else None
 wname = os.path.join(directories["exe"], "eric7")
 # determine entry for DYLD_FRAMEWORK_PATH
 dyldLine = ""
 try:
-from PyQt5.QtCore import QLibraryInfo
+from PyQt6.QtCore import QLibraryInfo
-qtLibraryDir = QLibraryInfo.location(QLibraryInfo.LibrariesPath)
+qtLibraryDir = QLibraryInfo.path(QLibraryInfo.LibrariesPath)
 except ImportError:
 qtLibraryDir = ""
 if qtLibraryDir:
 dyldLine = "DYLD_FRAMEWORK_PATH={0}\n".format(qtLibraryDir)
 print('Your Python installation is missing the XML module.')
 print('Please install it and try again.')
 exit(5)
 try:
-from PyQt5.QtCore import qVersion
+from PyQt6.QtCore import qVersion
 except ImportError as msg:
 installed = not isSudo and pipInstall(
 "PyQt5>=5.12.1",
 "'PyQt5' could not be detected.\nError: {0}".format(msg)
 )
 if installed:
 # try to import it again
 try:
-from PyQt5.QtCore import qVersion
+from PyQt6.QtCore import qVersion
 except ImportError as msg:
 print('Sorry, please install PyQt5.')
 print('Error: {0}'.format(msg))
 exit(1)
 else:
 exit(1)
 print("Found PyQt5")
 try:
 pyuic = "pyuic5"
-from PyQt5 import uic      # __IGNORE_WARNING__
+from PyQt6 import uic      # __IGNORE_WARNING__
 except ImportError as msg:
 print("Sorry, {0} is not installed.".format(pyuic))
 print('Error: {0}'.format(msg))
 exit(1)
 print("Found {0}".format(pyuic))
 try:
-from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
 except ImportError as msg:
-from PyQt5.QtCore import PYQT_VERSION
+from PyQt6.QtCore import PYQT_VERSION
 if PYQT_VERSION >= 0x050c00:
 # PyQt 5.12 separated QtWebEngine into a separate wheel
 if isSudo:
 print("Optional 'PyQtWebEngine' could not be detected.")
 else:
 "Optional 'PyQtWebEngine' could not be detected.\n"
 "Error: {0}".format(msg)
 )
 try:
-from PyQt5 import QtChart    # __IGNORE_WARNING__
+from PyQt6 import QtChart    # __IGNORE_WARNING__
 except ImportError as msg:
 if isSudo:
 print("Optional 'PyQtChart' could not be detected.")
 else:
 pipInstall(
 "Optional 'PyQtChart' could not be detected.\n"
 "Error: {0}".format(msg)
 )
 try:
-from PyQt5 import Qsci      # __IGNORE_WARNING__
+from PyQt6 import Qsci      # __IGNORE_WARNING__
 except ImportError as msg:
 installed = not isSudo and pipInstall(
 "QScintilla",
 "'QScintilla' could not be detected.\nError: {0}".format(msg)
 )
 if installed:
 # try to import it again
 try:
-from PyQt5 import Qsci      # __IGNORE_WARNING__
+from PyQt6 import Qsci      # __IGNORE_WARNING__
 message = None
 except ImportError as msg:
 message = str(msg)
 else:
 message = "QScintilla could not be installed."
 exit(2)
 # check version of sip
 with contextlib.suppress(ImportError, AttributeError):
 try:
-from PyQt5 import sip
+from PyQt6 import sip
 except ImportError:
 import sip
 sipVersion = sip.SIP_VERSION_STR
 print("sip Version:", sipVersion.strip())
 # always assume, that snapshots or dev versions are new enough
 .format(vers))
 print('Please install another version.')
 exit(3)
 # check version of PyQt
-from PyQt5.QtCore import PYQT_VERSION_STR
+from PyQt6.QtCore import PYQT_VERSION_STR
 pyqtVersion = PYQT_VERSION_STR
 print("PyQt Version:", pyqtVersion.strip())
 # always assume, that snapshots or dev versions are new enough
 if "snapshot" not in pyqtVersion and "dev" not in pyqtVersion:
 while pyqtVersion.count('.') < 2:
 .format(vers))
 print('Please install another version.')
 exit(4)
 # check version of QScintilla
-from PyQt5.Qsci import QSCINTILLA_VERSION_STR
+from PyQt6.Qsci import QSCINTILLA_VERSION_STR
 scintillaVersion = QSCINTILLA_VERSION_STR
 print("QScintilla Version:", QSCINTILLA_VERSION_STR.strip())
 # always assume, that snapshots or dev versions are new enough
 if "snapshot" not in scintillaVersion and "dev" not in scintillaVersion:
 while scintillaVersion.count('.') < 2:
 # print version info for additional modules
 with contextlib.suppress(NameError, AttributeError):
 print("PyQtChart:", QtChart.PYQT_CHART_VERSION_STR)
 with contextlib.suppress(ImportError, AttributeError):
-from PyQt5 import QtWebEngine
+from PyQt6 import QtWebEngine
 print("PyQtWebEngine.", QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
 print("All dependencies ok.")
 print()
 def compileUiFiles():
 """
 Compile the .ui files to Python sources.
 """
-from PyQt5.uic import compileUiDir
+from PyQt6.uic import compileUiDir
 compileUiDir(eric7SourceDir, True, __pyName)
 def prepareInfoFile(fileName):
 """

Mercurial Repositories > eric / file comparison

comparison: scripts/install.py

scripts/install.py