Merge pull request #154 from hanjinliu/test-py313

drop 3.8 and add 3.13

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
         platform: [ubuntu-latest, macos-latest, windows-latest]
         backend: [pyqt5]
         include:

magicclass/ext/vispy/__init__.py

@@ -1,10 +1,13 @@
-from .widgets2d import (
-    VispyPlotCanvas,
-    VispyImageCanvas,
-    VispyMultiPlotCanvas,
-    VispyMultiImageCanvas,
-)
-from .widgets3d import Vispy3DCanvas, VispyMulti3DCanvas
+try:
+    from .widgets2d import (
+        VispyPlotCanvas,
+        VispyImageCanvas,
+        VispyMultiPlotCanvas,
+        VispyMultiImageCanvas,
+    )
+    from .widgets3d import Vispy3DCanvas, VispyMulti3DCanvas
+except OSError:
+    pass  # cannot run vispy in macOS and python 3.13
 
 __all__ = [
     "VispyPlotCanvas",

magicclass/ext/vispy/tests/test_vispy2d.py

@@ -1,8 +1,12 @@
+import sys
 import numpy as np
 from numpy.testing import assert_allclose
-from magicclass.ext.vispy import VispyPlotCanvas
+import pytest
 
+@pytest.mark.skipif(not (sys.version_info < (3, 13)), reason="requires python<3.13")
 def test_add_and_delete_data():
+    from magicclass.ext.vispy import VispyPlotCanvas
+
     canvas = VispyPlotCanvas()
     curve = canvas.add_curve(np.random.random(100), color="blue")
     assert len(canvas.layers) == 1

magicclass/functools/_dispatch.py

@@ -118,11 +118,8 @@ class singledispatchmethod(functools.singledispatchmethod):
     """
 
     def __init__(self, func):
-        if not callable(func) and not hasattr(func, "__get__"):
-            raise TypeError(f"{func!r} is not callable or a descriptor")
-
+        super().__init__(func)
         self.dispatcher = singledispatch(func)
-        self.func = func
         if sys.version_info < (3, 10):
             self._wrapped_func = func
         functools.update_wrapper(

pyproject.toml

@@ -9,17 +9,17 @@ classifiers = [
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dynamic = ["version"]
 description = "Generate multifunctional GUIs from classes"
 readme = "README.md"
 license = { file = "LICENSE" }
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 authors = [
     { name = "Hanjin Liu", email = "[email protected]" },
 ]