myokit 1.33.9__py3-none-any.whl → 1.35.0__py3-none-any.whl

myokit/formats/wcp/_wcp.py

@@ -4,9 +4,6 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 import os
 import struct
 import numpy as np
@@ -17,7 +14,7 @@ import myokit
 _ENC = 'ascii'
 
 
-class WcpFile(object):
+class WcpFile:
     """
     Represents a read-only WinWCP file (``.wcp``), stored at the location
     pointed to by ``filepath``.
@@ -35,7 +32,6 @@ class WcpFile(object):
     """
     def __init__(self, filepath):
         # The path to the file and its basename
-        # Ensure it's a `str` for Python2/3 compatibility
         filepath = str(filepath)
         self._filepath = os.path.abspath(filepath)
         self._filename = os.path.basename(filepath)
@@ -160,8 +156,6 @@ class WcpFile(object):
             rtype = f.read(4)
 
             # Group number (float set by the user)
-            # Note: First argument to struct.unpack must be a str (so bytes on
-            # Python 2).
             group_number = struct.unpack(str('<f'), f.read(4))[0]
 
             # Time of recording, as float, not sure how to interpret
@@ -231,7 +225,7 @@ class WcpFile(object):
         Creates and returns a:class:`myokit.DataLog` containing all the
         data from this file.
 
-        Each channel is stored under its own name, with an indice indicating
+        Each channel is stored under its own name, with an index indicating
         the record it was from. Time is stored under ``time``.
         """
         log = myokit.DataLog()

myokit/formats/xml/__init__.py

@@ -4,9 +4,6 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 from ._exporter import XMLExporter
 from ._split import split   # noqa
 

myokit/formats/xml/_exporter.py

@@ -4,9 +4,6 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 import os
 
 from lxml import etree

myokit/formats/xml/_split.py

@@ -4,9 +4,6 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 
 def split(tag):
     """

myokit/gui/__init__.py

@@ -4,303 +4,136 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
-# Library imports
-import logging
 import os
 import platform
 import signal
 import sys
 
-# Myokit imports
 import myokit
 
 # Detect platform
 platform = platform.system()
 
 # Select Qt library to use
-pyqt4 = False
 pyqt5 = False
-pyside = False
+pyqt6 = False
 pyside2 = False
+pyside6 = False
 
 # Allow overriding automatic selection
+if myokit.FORCE_PYQT6:
+    pyqt6 = True
 if myokit.FORCE_PYQT5:
     pyqt5 = True
-elif myokit.FORCE_PYQT4:
-    pyqt4 = True
-elif myokit.FORCE_PYSIDE:
-    pyside = True
+elif myokit.FORCE_PYSIDE6:
+    pyside6 = True
 elif myokit.FORCE_PYSIDE2:
     pyside2 = True
 else:
     # Automatic selection
     try:
-        import PyQt5  # noqa
-        pyqt5 = True
+        import PyQt6  # noqa
+        pyqt6 = True
     except ImportError:
         try:
-            import PySide2  # noqa
-            pyside2 = True
+            import PySide6  # noqa
+            pyside6 = True
         except ImportError:
             try:
-                import PyQt4  # noqa
-                pyqt4 = True
+                import PyQt5  # noqa
+                pyqt5 = True
             except ImportError:
                 try:
-                    import PySide  # noqa
-                    pyside = True
+                    import PySide2  # noqa
+                    pyside2 = True
                 except ImportError:
                     raise ImportError(
-                        'Unable to find PyQt5, PyQt4, PySide2 or PySide')
+                        'Unable to find PyQt6, PyQt5, PySide6, or PySide2.')
+
 
 # Import and configure Qt
-if pyqt5:
+if pyqt6:
+    from PyQt6 import QtGui, QtWidgets, QtCore
+    from PyQt6.QtCore import Qt
+
+    # Use PySide signal names
+    QtCore.Signal = QtCore.pyqtSignal
+    QtCore.Slot = QtCore.pyqtSlot
+    QtCore.Property = QtCore.pyqtProperty
+
+    # Set backend variables
+    backend = 'PyQt6'
+    qtversion = 6
 
-    # Load PyQt5
+elif pyqt5:
     from PyQt5 import QtGui, QtWidgets, QtCore
     from PyQt5.QtCore import Qt
 
-    # Fix PyQt naming issues
+    # Mimic PyQt6 API changes
+    # https://doc.qt.io/qt-6/widgets-changes-qt6.html
+    QtGui.QAction = QtWidgets.QAction
+    QtWidgets.QApplication.exec = QtWidgets.QApplication.exec_
+
+    # Use PySide signal names
     QtCore.Signal = QtCore.pyqtSignal
     QtCore.Slot = QtCore.pyqtSlot
     QtCore.Property = QtCore.pyqtProperty
 
-    # Configure Matplotlib for use with PyQt5
-    import matplotlib
-    try:
-        matplotlib.use('Qt5Agg')
-    except ImportError:
-        # In matplotlib 3.7.0 this raises ImportErrors if a previous backend
-        # was already set.
-        pass
-    else:   # pragma: no cover
-        # The method below was deprecated by matplotlib version 2.2, released
-        # in 2018. So probably fine to remove this (and similar) after 2023
-        v = [int(x) for x in matplotlib.__version__.split('.')]
-        if v[0] < 3 and v[1] < 3:
-            matplotlib.rcParams['backend.qt5'] = 'PyQt5'
-    import matplotlib.backends.backend_qt5agg as matplotlib_backend
-
     # Set backend variables
     backend = 'PyQt5'
     qtversion = 5
 
-elif pyside2:
+elif pyside6:
+    from PySide6 import QtGui, QtWidgets, QtCore
+    from PySide6.QtCore import Qt
 
-    # Load PySide2
-    # Load main classes
+    # Mimic PyQt6 API changes
+    QtWidgets.QApplication.exec = QtWidgets.QApplication.exec_
+
+    # Set backend variables
+    backend = 'PySide6'
+    qtversion = 6
+
+elif pyside2:
     from PySide2 import QtGui, QtWidgets, QtCore
     from PySide2.QtCore import Qt
 
-    # Configure Matplotlib for use with PySide2
-    import matplotlib
-    try:
-        matplotlib.use('Qt5Agg')
-    except ImportError:
-        # In matplotlib 3.3.0 this raises ImportErrors if a previous backend
-        # was already set.
-        pass
-    else:   # pragma: no cover
-        v = [int(x) for x in matplotlib.__version__.split('.')]
-        if v[0] < 3 and v[1] < 3:
-            matplotlib.rcParams['backend.qt5'] = 'PySide2'
-    import matplotlib.backends.backend_qt5agg as matplotlib_backend  # noqa
+    # Mimic PyQt6 API changes
+    QtGui.QAction = QtWidgets.QAction
+    QtWidgets.QApplication.exec = QtWidgets.QApplication.exec_
 
     # Set backend variables
     backend = 'PySide2'
     qtversion = 5
 
-elif pyqt4:
-
-    # Load PyQt4
-
-    # Deprecated since 2019-09-11
-    logger = logging.getLogger('myokit')
-    logger.warning(
-        'PyQt4 support has been deprecated. Please upgrade to PyQt5 or'
-        ' Pyside2.'
-    )
-
-    # Set PyQt to "API 2"
-    import sip
-    sip.setapi('QString', 2)
-    sip.setapi('QVariant', 2)
-    sip.setapi('QDate', 2)
-    sip.setapi('QDateTime', 2)
-    sip.setapi('QTextStream', 2)
-    sip.setapi('QTime', 2)
-    sip.setapi('QUrl', 2)
-
-    # Load main classes
-    from PyQt4 import QtGui, QtCore
-    from PyQt4.QtCore import Qt
-
-    # Qt5 compatibility
-    QtWidgets = QtGui
-    QtCore.QItemSelection = QtGui.QItemSelection
-    QtCore.QItemSelectionModel = QtGui.QItemSelectionModel
-    QtCore.QItemSelectionRange = QtGui.QItemSelectionRange
-    QtCore.QSortFilterProxyModel = QtGui.QSortFilterProxyModel
-    QtWidgets.QStyleOptionViewItem = QtWidgets.QStyleOptionViewItemV4
-
-    # Fix Qt4 location issue
-    import PyQt4.Qt
-    QtGui.QKeySequence = PyQt4.Qt.QKeySequence
-    QtGui.QTextCursor = PyQt4.Qt.QTextCursor
-    del PyQt4.Qt
-
-    # Fix PyQt4 naming issues
-    QtCore.Signal = QtCore.pyqtSignal
-    QtCore.Slot = QtCore.pyqtSlot
-    QtCore.Property = QtCore.pyqtProperty
-
-    # Fix QFileDialog.getOpenFileName return type issues:
-    # Return type in PyQt4 is not a tuple (call ...AndFilter methods instead)
-    # Fix getOpenFileName
-    def gofn(parent=None, caption='', directory='', filter='',
-             initialFilter='', options=0):
-        if options == 0:
-            options = QtWidgets.QFileDialog.Options()
-        return QtWidgets.QFileDialog.getOpenFileNameAndFilter(
-            parent, caption, directory, filter, initialFilter, options)
-    QtWidgets.QFileDialog.getOpenFileName = staticmethod(gofn)
-    del gofn
-
-    # Fix getOpenFileNames
-    def gofns(parent=None, caption='', directory='', filter='',
-              initialFilter='', options=0):
-        if options == 0:
-            options = QtWidgets.QFileDialog.Options()
-        return QtWidgets.QFileDialog.getOpenFileNamesAndFilter(
-            parent, caption, directory, filter, initialFilter, options)
-    QtWidgets.QFileDialog.getOpenFileNames = staticmethod(gofns)
-    del gofns
-
-    # Fix getSaveFileName
-    def gsfn(parent=None, caption='', directory='', filter='',
-             initialFilter='', options=0):
-        if options == 0:
-            options = QtWidgets.QFileDialog.Options()
-        return QtWidgets.QFileDialog.getSaveFileNameAndFilter(
-            parent, caption, directory, filter, initialFilter, options)
-    QtWidgets.QFileDialog.getSaveFileName = staticmethod(gsfn)
-    del gsfn
-
-    # Configure Matplotlib for use with PyQt4
-    import matplotlib
-    try:
-        matplotlib.use('Qt4Agg')
-    except ImportError:
-        # In matplotlib 3.3.0 this raises ImportErrors if a previous backend
-        # was already set.
-        pass
-    else:   # pragma: no cover
-        v = [int(x) for x in matplotlib.__version__.split('.')]
-        if v[0] < 3 and v[1] < 3:
-            matplotlib.rcParams['backend.qt4'] = 'PyQt4'
-    import matplotlib.backends.backend_qt4agg as matplotlib_backend
+else:
+    raise Exception('Selection of qt version failed.')
 
-    # Set backend variables
-    backend = 'PyQt4'
-    qtversion = 4
-
-elif pyside:
-
-    # Load PySide
-
-    # Deprecated since 2019-09-11
-    logger = logging.getLogger('myokit')
-    logger.warning(
-        'PySide support has been deprecated. Please upgrade to PyQt5 or'
-        ' Pyside2.'
-    )
-
-    # Load main classes
-    from PySide import QtGui, QtCore
-    from PySide.QtCore import Qt
-
-    # Qt5 compatibility
-    QtWidgets = QtGui
-    QtCore.QItemSelection = QtGui.QItemSelection
-    QtCore.QItemSelectionModel = QtGui.QItemSelectionModel
-    QtCore.QItemSelectionRange = QtGui.QItemSelectionRange
-    QtCore.QSortFilterProxyModel = QtGui.QSortFilterProxyModel
-    QtWidgets.QStyleOptionViewItem = QtWidgets.QStyleOptionViewItemV4
-
-    # Fix QFileDialog.getOpenFileName signature issues (is different in PySide,
-    #  which causes issues when using keyword arguments. This is fixed simply
-    #  by simply wrapping the methods.)
-    # Signature in PySide
-    #  parent
-    #  caption
-    #  dir --> directory PyQt4/5
-    #  filter
-    #  selectedFilter --> initialFilter in PyQt4/5
-    #  options
-
-    # Fix getOpenFileName
-    gofn_org = QtWidgets.QFileDialog.getOpenFileName
-
-    def gofn(parent=None, caption='', directory='', filter='',
-             initialFilter='', options=0):
-        if options == 0:
-            options = QtWidgets.QFileDialog.Options()
-        return gofn_org(
-            parent, caption, directory, filter, initialFilter, options)
-    QtWidgets.QFileDialog.getOpenFileName = staticmethod(gofn)
-    del gofn
-
-    # Fix getOpenFileNames
-    gofns_org = QtWidgets.QFileDialog.getOpenFileNames
-
-    def gofns(parent=None, caption='', directory='', filter='',
-              initialFilter='', options=0):
-        if options == 0:
-            options = QtWidgets.QFileDialog.Options()
-        return gofns_org(
-            parent, caption, directory, filter, initialFilter, options)
-    QtWidgets.QFileDialog.getOpenFileNames = staticmethod(gofns)
-    del gofns
-
-    # Fix getSaveFileName
-    gsfn_org = QtWidgets.QFileDialog.getSaveFileName
-
-    def gsfn(parent=None, caption='', directory='', filter='',
-             initialFilter='', options=0):
-        if options == 0:
-            options = QtWidgets.QFileDialog.Options()
-        return gsfn_org(
-            parent, caption, directory, filter, initialFilter, options)
-    QtWidgets.QFileDialog.getSaveFileName = staticmethod(gsfn)
-    del gsfn
-
-    # Configure Matplotlib for use with PySide
-    import matplotlib
-    try:
-        matplotlib.use('Qt4Agg')
-    except ImportError:
-        # In matplotlib 3.3.0 this raises ImportErrors if a previous backend
-        # was already set.
-        pass
-    else:   # pragma: no cover
-        v = [int(x) for x in matplotlib.__version__.split('.')]
-        if v[0] < 3 and v[1] < 3:
-            matplotlib.rcParams['backend.qt4'] = 'PySide'
-    import matplotlib.backends.backend_qt4agg as matplotlib_backend  # noqa
 
-    # Set backend variables
-    backend = 'PySide'
-    qtversion = 4
+# Configure Matplotlib for use with Qt
+import matplotlib  # noqa
+try:
+    matplotlib.use('QtAgg')
+except ImportError:
+    # In matplotlib 3.7.0 this raises ImportErrors if a previous backend
+    # was already set.
+    pass
+try:
+    # New Matplotlib no longer has qt4agg/qt5agg, but now uses qtagg for all
+    import matplotlib.backends.back_qtagg as matplotlib_backend  # noqa
+except ImportError:
+    # https://matplotlib.org/stable/api/backend_qt_api.html
+    import matplotlib.backends.backend_qt5agg as matplotlib_backend  # noqa
 
-else:
+# Delete temporary variables
+del pyqt5, pyqt6, pyside2, pyside6
 
-    raise Exception('Selection of qt version failed.')
 
-# Delete temporary variables
-del pyqt4, pyqt5, pyside
+# Load Gnome theme on Wayland (for icons)
+if platform == 'Linux':
+    icon = QtGui.QIcon.fromTheme('document-new')
+    if icon.isNull():
+        QtGui.QIcon.setThemeName('gnome')
 
 # Icons with fallback for apple and windows
 ICON_PATH = os.path.join(myokit.DIR_DATA, 'gui')
@@ -317,11 +150,11 @@ for k, v in ICONS.items():
     ICONS[k] = os.path.join(ICON_PATH, v)
 
 # Toolbar style suitable for platform
-TOOL_BUTTON_STYLE = Qt.ToolButtonTextUnderIcon
+TOOL_BUTTON_STYLE = Qt.ToolButtonStyle.ToolButtonTextUnderIcon
 if platform == 'Windows':   # pragma: no linux cover
-    TOOL_BUTTON_STYLE = Qt.ToolButtonIconOnly
+    TOOL_BUTTON_STYLE = Qt.ToolButtonStyle.ToolButtonIconOnly
 elif platform == 'Darwin':  # pragma: no linux cover
-    TOOL_BUTTON_STYLE = Qt.ToolButtonTextOnly
+    TOOL_BUTTON_STYLE = Qt.ToolButtonStyle.ToolButtonTextOnly
 
 
 # Stand alone applications
@@ -349,10 +182,11 @@ def qtMonospaceFont():
     """
     font = QtGui.QFont('monospace')
     if platform == 'Windows':   # pragma: no linux cover
-        font.setStyleHint(QtGui.QFont.TypeWriter)
+        font.setStyleHint(QtGui.QFont.StyleHint.TypeWriter)
     else:
-        font.setStyleHint(QtGui.QFont.Monospace)
-    font.setHintingPreference(QtGui.QFont.PreferVerticalHinting)  # Qt5
+        font.setStyleHint(QtGui.QFont.StyleHint.Monospace)
+    font.setHintingPreference(
+        QtGui.QFont.HintingPreference.PreferVerticalHinting)
     return font
 
 
@@ -402,5 +236,5 @@ def run(app, *args):
     timer.timeout.connect(lambda: None)
 
     # Wait for app to exit
-    sys.exit(a.exec_())
+    sys.exit(a.exec())