Merge pull request #59 from jonathanhogg/build_python3.13

Python 3.13 support

Author: jonathanhogg

.github/workflows/ci-test.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
         include:
         - os: macos-13

pyproject.toml

@@ -23,6 +23,7 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
   "Environment :: Console",
   "Environment :: GPU",
   "Environment :: MacOS X",

src/flitter/language/vm.pyx

@@ -10,6 +10,7 @@ from .. import name_patch
 from ..cache import SharedCache
 from .functions import STATIC_FUNCTIONS, DYNAMIC_FUNCTIONS
 from ..model cimport StateDict, null_, true_, false_, inf_, nan_
+from ..timer cimport perf_counter
 from .noise import NOISE_FUNCTIONS
 
 from libc.math cimport floor as c_floor
@@ -25,16 +26,9 @@ from cpython.tuple cimport PyTuple_New, PyTuple_GET_ITEM, PyTuple_SET_ITEM, PyTu
 
 
 cdef extern from "Python.h":
-    ctypedef int64_t _PyTime_t
-    _PyTime_t _PyTime_GetPerfCounter() noexcept nogil
-    double _PyTime_AsSecondsDouble(_PyTime_t t) noexcept nogil
     object PyObject_CallOneArg(object callable_object, object arg)
 
 
-cdef inline double perf_counter() noexcept nogil:
-    return _PyTime_AsSecondsDouble(_PyTime_GetPerfCounter())
-
-
 logger = name_patch(logger, __name__)
 
 cdef const char* ContextFunc = "context_func\0"

src/flitter/render/window/canvas.pyx

@@ -10,26 +10,18 @@ import cython
 from cpython cimport array, PyObject
 from cpython.dict cimport PyDict_GetItem, PyDict_SetItem
 from libc.math cimport acos, sqrt
-from libc.stdint cimport int64_t, uint32_t
+from libc.stdint cimport uint32_t
 from loguru import logger
 import skia
 
 from . import WindowNode
 from flitter import name_patch
 from ...cache import SharedCache
 from ...model cimport Vector, Node
+from ...timer cimport perf_counter
 from .glconstants import GL_TEXTURE_2D, GL_RGBA8, GL_RGBA16F, GL_RGBA32F
 from .target import RenderTarget, COLOR_FORMATS
 
-cdef extern from "Python.h":
-    ctypedef int64_t _PyTime_t
-    _PyTime_t _PyTime_GetPerfCounter() noexcept nogil
-    double _PyTime_AsSecondsDouble(_PyTime_t t) noexcept nogil
-
-
-cdef inline double perf_counter() noexcept nogil:
-    return _PyTime_AsSecondsDouble(_PyTime_GetPerfCounter())
-
 
 logger = name_patch(logger, __name__)
 

src/flitter/timer.pxd

@@ -0,0 +1,19 @@
+
+cdef extern from *:
+    """
+#include "Python.h"
+
+#if PY_MINOR_VERSION >= 13
+    static inline double perf_counter() {
+        PyTime_t result;
+        PyTime_PerfCounter(&result);
+        return PyTime_AsSecondsDouble(result);
+    }
+#else
+    static inline double perf_counter() {
+        return _PyTime_AsSecondsDouble(_PyTime_GetPerfCounter());
+    }
+#endif
+    """
+
+    cdef double perf_counter() noexcept nogil