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

myokit/tests/test_protocol.py

@@ -5,9 +5,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 pickle
 import unittest
 
@@ -15,12 +12,6 @@ import myokit
 
 from myokit.tests import WarningCollector
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class ProtocolTest(unittest.TestCase):
     """

myokit/tests/test_protocol_floating_point.py

@@ -26,21 +26,12 @@
 # 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 unittest
 
 import myokit
 
 from myokit.tests.ansic_event_based_pacing import AnsicEventBasedPacing
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class ProtocolFloatingPointTest(unittest.TestCase):
 

myokit/tests/test_protocol_time_series.py

@@ -5,22 +5,12 @@
 # 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 unittest
 import pickle
 
 import myokit
 
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 class TimeSeriesProtocolTest(unittest.TestCase):
     """
     Tests the TimeSeriesProtocol class.

myokit/tests/test_pype.py

@@ -5,9 +5,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 unittest
 
 import myokit
@@ -15,12 +12,6 @@ import myokit.pype
 
 from myokit.tests import TemporaryDirectory
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class PypeTest(unittest.TestCase):
 

myokit/tests/test_quantity.py

@@ -5,19 +5,10 @@
 # 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 unittest
 
 import myokit
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class QuantityTest(unittest.TestCase):
     """

myokit/tests/test_rhs_benchmarker.py

@@ -5,20 +5,12 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class RhsBenchmarkerTest(unittest.TestCase):
     """

myokit/tests/test_sbml_api.py

@@ -5,9 +5,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 unittest
 
 import myokit
@@ -18,18 +15,6 @@ from myokit.formats.sbml._api import _MyokitConverter as X
 
 from myokit.tests import WarningCollector
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:  # pragma: no python 3 cover
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
-
 
 class TestCompartment(unittest.TestCase):
     """

myokit/tests/test_sbml_parser.py

@@ -5,9 +5,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 unittest
 
 import myokit
@@ -17,18 +14,6 @@ from myokit.formats.sbml import SBMLParser, SBMLParsingError
 
 from myokit.tests import WarningCollector
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:  # pragma: no python 3 cover
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
-
 
 class TestSBMLParser(unittest.TestCase):
     """

myokit/tests/test_simulation_1d.py

@@ -5,24 +5,15 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
 
 from myokit.tests import DIR_DATA, CancellingReporter
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 # Show simulation output
 debug = False
 

myokit/tests/test_simulation_cvodes.py

@@ -5,9 +5,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 pickle
 import platform
@@ -26,12 +23,6 @@ from myokit.tests import (
     WarningCollector,
 )
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class SimulationTest(unittest.TestCase):
     """
@@ -297,13 +288,14 @@ class SimulationTest(unittest.TestCase):
         d = self.sim.run(n, log_interval=1)
         self.assertEqual(list(d.time()), times)
         self.assertEqual(list(d['engine.pace']), values)
-        self.assertRaisesRegex(
-            ValueError, 'No times',
-            self.sim.set_fixed_form_protocol, values=values)
-        self.assertRaisesRegex(
-            ValueError, 'No values',
-            self.sim.set_fixed_form_protocol, times=times)
-        self.sim.set_fixed_form_protocol(None)
+        with WarningCollector() as w:
+            self.assertRaisesRegex(
+                ValueError, 'No times',
+                self.sim.set_fixed_form_protocol, values=values)
+            self.assertRaisesRegex(
+                ValueError, 'No values',
+                self.sim.set_fixed_form_protocol, times=times)
+            self.sim.set_fixed_form_protocol(None)
         self.sim.reset()
         d = self.sim.run(n, log_interval=1)
         self.assertEqual(list(d['engine.pace']), [0] * n)

myokit/tests/test_simulation_cvodes_from_disk.py

@@ -5,9 +5,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 unittest
 

myokit/tests/test_simulation_fiber_tissue.py

@@ -5,11 +5,9 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
@@ -21,13 +19,6 @@ from myokit.tests import (
     WarningCollector,
 )
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 # Show simulation output
 debug = False
 

myokit/tests/test_simulation_log_interval.py

@@ -5,9 +5,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 unittest
 
@@ -17,12 +14,6 @@ import myokit
 
 from myokit.tests import DIR_DATA
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 # Extra output
 debug = False
 

myokit/tests/test_simulation_opencl.py

@@ -8,11 +8,9 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
@@ -25,13 +23,6 @@ from myokit.tests import (
     WarningCollector,
 )
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 # Show simulation output
 debug = False
 

myokit/tests/test_simulation_opencl_log_interval.py

@@ -5,11 +5,9 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit

myokit/tests/test_simulation_opencl_vs_cvode.py

@@ -5,24 +5,15 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
 
 from myokit.tests import OpenCL_DOUBLE_PRECISION, DIR_DATA
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 # Show simulation output
 debug = False
 

myokit/tests/test_simulation_opencl_vs_sim1d.py

@@ -5,24 +5,15 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
 
 from myokit.tests import OpenCL_DOUBLE_PRECISION, DIR_DATA
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 # Show simulation output
 debug = False
 

myokit/tests/test_system_info.py

@@ -5,21 +5,11 @@
 # 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 unittest
 
 import myokit
 
 
-# Strings in Python2 and Python3
-try:
-    basestring
-except NameError:   # pragma: no cover
-    basestring = str
-
-
 class SystemInfoTest(unittest.TestCase):
     """
     Tests the system info method.
@@ -29,7 +19,7 @@ class SystemInfoTest(unittest.TestCase):
         import matplotlib
         matplotlib.use('template')
 
-        self.assertIsInstance(myokit.system(), basestring)
+        self.assertIsInstance(myokit.system(), str)
         with myokit.tools.capture():
             myokit.system(live_printing=True)
 

myokit/tests/test_tools.py

@@ -5,9 +5,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 re
 import sys
@@ -15,12 +12,6 @@ import threading
 import time
 import unittest
 
-# Strings in Python2 and Python3
-try:
-    basestring
-except NameError:   # pragma: no cover
-    basestring = str
-
 import myokit
 
 from myokit.tests import TemporaryDirectory

myokit/tests/test_unit.py

@@ -5,19 +5,10 @@
 # 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 unittest
 
 import myokit
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class MyokitUnitTest(unittest.TestCase):
 

myokit/tests/test_user_functions.py

@@ -5,19 +5,9 @@
 # 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 unittest
 import myokit
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 # Further testing in test_model.py
 
 

myokit/tests/test_variable.py

@@ -5,9 +5,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 unittest
 
 import numpy as np
@@ -17,13 +14,6 @@ import myokit
 from myokit.tests import WarningCollector
 
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 class VariableTest(unittest.TestCase):
     """
     Tests parts of :class:`myokit.Variable`.

myokit/tools.py

@@ -6,9 +6,7 @@
 # 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 io
 import os
 import re
 import shutil
@@ -18,18 +16,12 @@ import tempfile
 import threading
 import timeit
 
-# StringIO in Python 2 and 3
-try:
-    from cStringIO import StringIO
-except ImportError:  # pragma: no python 2 cover
-    from io import StringIO
-
 
 # Natural sort regex
 _natural_sort_regex = re.compile('([0-9]+)')
 
 
-class Benchmarker(object):
+class Benchmarker:
     """
     Allows benchmarking using the with statement.
 
@@ -97,7 +89,7 @@ class Benchmarker(object):
         return timeit.default_timer() - self._start
 
 
-class capture(object):
+class capture:
     """
     Context manager that temporarily redirects the current standard output and
     error streams, and captures anything that's written to them.
@@ -224,8 +216,8 @@ class capture(object):
         # Redirect
         if not self._fd:
             # Create temporary output and error streams
-            self._tmp_out = StringIO()
-            self._tmp_err = StringIO()
+            self._tmp_out = io.StringIO()
+            self._tmp_err = io.StringIO()
 
             # Redirect, attempting to flush first
             try:
@@ -391,10 +383,6 @@ class capture(object):
             return ''
         text = self._txt_err
 
-        # In Python 2, the text needs to be decoded from ascii
-        if sys.hexversion < 0x03000000:  # pragma: no python 3 cover
-            text = text.decode('ascii', 'ignore')
-
         return text
 
     def out(self):
@@ -406,10 +394,6 @@ class capture(object):
             return ''
         text = self._txt_out
 
-        # In Python 2, the text needs to be decoded from ascii
-        if sys.hexversion < 0x03000000:  # pragma: no python 3 cover
-            text = text.decode('ascii', 'ignore')
-
         return text
 
     def text(self):

myokit/units.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 myokit
 
 

{myokit-1.34.0.dist-info → myokit-1.35.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myokit
-Version: 1.34.0
+Version: 1.35.0
 Summary: A simple interface to cardiac cellular electrophysiology
 Home-page: http://myokit.org
 Author: Michael Clerx
@@ -13,7 +13,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Bio-Informatics
@@ -21,29 +20,30 @@ Classifier: Topic :: Scientific/Engineering :: Chemistry
 Classifier: Topic :: Scientific/Engineering :: Mathematics
 Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Classifier: Topic :: Scientific/Engineering :: Physics
+Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: configparser
 Requires-Dist: lxml
-Requires-Dist: matplotlib (>=1.5)
+Requires-Dist: matplotlib (>=2.2)
 Requires-Dist: numpy
 Requires-Dist: setuptools
 Provides-Extra: dev
 Requires-Dist: coverage ; extra == 'dev'
 Requires-Dist: flake8 (>=3) ; extra == 'dev'
 Provides-Extra: docs
-Requires-Dist: sphinx (!=1.7.3,>=1.5) ; extra == 'docs'
+Requires-Dist: sphinx (>=1.7.4) ; extra == 'docs'
 Provides-Extra: gui
-Requires-Dist: pyqt5 ; extra == 'gui'
+Requires-Dist: pyqt6 ; extra == 'gui'
 Requires-Dist: sip ; extra == 'gui'
 Provides-Extra: optional
 Requires-Dist: scipy ; extra == 'optional'
 Requires-Dist: sympy ; extra == 'optional'
 Provides-Extra: pyqt
-Requires-Dist: pyqt5 ; extra == 'pyqt'
+Requires-Dist: pyqt6 ; extra == 'pyqt'
 Requires-Dist: sip ; extra == 'pyqt'
 Provides-Extra: pyside
-Requires-Dist: pyside2 ; extra == 'pyside'
+Requires-Dist: pyside6 ; extra == 'pyside'
 
 [![Ubuntu unit tests](https://github.com/myokit/myokit/actions/workflows/unit-tests-ubuntu.yml/badge.svg)](https://github.com/myokit/myokit/actions/workflows/unit-tests-ubuntu.yml)
 [![MacOS unit tests](https://github.com/myokit/myokit/actions/workflows/unit-tests-macos.yml/badge.svg)](https://github.com/myokit/myokit/actions/workflows/unit-tests-macos.yml)