feat: Support for Python 3.12, 3.13 and 3.14

Author: Periecle

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         # Test all supported versions on Ubuntu:
         os: [ubuntu-latest]
-        python: ["3.9", "3.10", "3.11", "pypy-3.10"]
+        python: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "pypy-3.10"]
         experimental: [false]
           # include:
           #   - os: macos-latest

setup.py

@@ -78,7 +78,7 @@ def run(self):
         raise NotImplementedError("platform '%s' is not supported!" % sys.platform)
     extra_compile_args.append('-I src/')
     extra_compile_args.append('-I src/libbacktrace')
-    if sys.version_info[:2] == (3,11):
+    if sys.version_info[:2] >= (3,11):
         extra_source_files += ['src/populate_frames.c']
     ext_modules = [Extension('_vmprof',
                            sources=[
@@ -123,7 +123,7 @@ def run(self):
         'pytz',
         'colorama',
     ] + extra_install_requires,
-    python_requires='<3.12',
+    python_requires='<3.15',
     tests_require=['pytest','cffi','hypothesis'],
     entry_points = {
         'console_scripts': [

src/_vmprof.c

@@ -14,7 +14,13 @@
 
 #ifndef RPYTHON_VMPROF
   #if PY_VERSION_HEX >= 0x030b00f0 /* >= 3.11 */
+  #define Py_BUILD_CORE
+  #if PY_VERSION_HEX >= 0x030E0000 /* >= 3.14 */
+  #include "internal/pycore_interpframe.h"
+  #else
   #include "internal/pycore_frame.h"
+  #endif
+  #undef PY_BUILD_CORE
   #include "populate_frames.h"
   #endif
 #endif
@@ -140,7 +146,11 @@ void emit_all_code_objects(PyObject * seen_code_ids)
     Py_ssize_t i, size;
     void * param[2];
 
+#if PY_VERSION_HEX >= 0x030D0000  /* >= 3.13 */
+    gc_module = PyImport_ImportModule("gc");
+#else
     gc_module = PyImport_ImportModuleNoBlock("gc");
+#endif
     if (gc_module == NULL)
         goto error;
 

src/populate_frames.c

@@ -7,6 +7,11 @@
 
 // 0x030B0000 is 3.11.
 #define PY_311 0x030B0000
+// 0x030D0000 is 3.13.
+#define PY_313 0x030D0000
+// 0x030E0000 is 3.14.
+#define PY_314 0x030E0000
+
 #if PY_VERSION_HEX >= PY_311
 
 /**
@@ -22,15 +27,26 @@
  */
 
 #define Py_BUILD_CORE
+#if PY_VERSION_HEX >= PY_314
+// Python 3.14 moved frame internals to pycore_interpframe.h
+#include "internal/pycore_interpframe.h"
+#else
 #include "internal/pycore_frame.h"
+#endif
 #undef Py_BUILD_CORE
 
 // Modified from
 // https://github.com/python/cpython/blob/v3.11.4/Python/pystate.c#L1278-L1285
 _PyInterpreterFrame *unsafe_PyThreadState_GetInterpreterFrame(
     PyThreadState *tstate) {
   assert(tstate != NULL);
+#if PY_VERSION_HEX >= PY_313
+  // In Python 3.13+, cframe was removed and current_frame is directly on tstate
+  _PyInterpreterFrame *f = tstate->current_frame;
+#else
+  // Python 3.11 and 3.12 use cframe->current_frame
   _PyInterpreterFrame *f = tstate->cframe->current_frame;
+#endif
   while (f && _PyFrame_IsIncomplete(f)) {
     f = f->previous;
   }
@@ -47,7 +63,13 @@ PyCodeObject *unsafe_PyInterpreterFrame_GetCode(
     _PyInterpreterFrame *frame) {
   assert(frame != NULL);
   assert(!_PyFrame_IsIncomplete(frame));
+#if PY_VERSION_HEX >= PY_313
+  // In Python 3.13+, use the _PyFrame_GetCode inline function
+  // f_code was renamed to f_executable
+  PyCodeObject *code = _PyFrame_GetCode(frame);
+#else
   PyCodeObject *code = frame->f_code;
+#endif
   assert(code != NULL);
   return code;
 }
@@ -71,6 +93,10 @@ _PyInterpreterFrame *unsafe_PyInterpreterFrame_GetBack(
 // this function is not available in libpython
 int _PyInterpreterFrame_GetLine(_PyInterpreterFrame *frame) {
   int addr = _PyInterpreterFrame_LASTI(frame) * sizeof(_Py_CODEUNIT);
+#if PY_VERSION_HEX >= PY_313
+  return PyCode_Addr2Line(_PyFrame_GetCode(frame), addr);
+#else
   return PyCode_Addr2Line(frame->f_code, addr);
+#endif
 }
-#endif  // PY_VERSION_HEX >= PY_311
+#endif  // PY_VERSION_HEX >= PY_311

src/populate_frames.h

@@ -7,9 +7,17 @@
 
 #include <frameobject.h>
 
-#define Py_BUILD_CORE
+// 0x030E0000 is 3.14.
+#define PY_314 0x030E0000
+
+#define PY_BUILD_CORE
+#if PY_VERSION_HEX >= PY_314
+// Python 3.14 moved frame internals to pycore_interpframe.h
+#include "internal/pycore_interpframe.h"
+#else
 #include "internal/pycore_frame.h"
-#undef Py_BUILD_CORE
+#endif
+#undef PY_BUILD_CORE
 
 _PyInterpreterFrame *unsafe_PyThreadState_GetInterpreterFrame(PyThreadState *tstate);
 
@@ -19,4 +27,4 @@ _PyInterpreterFrame *unsafe_PyInterpreterFrame_GetBack(_PyInterpreterFrame *fram
 
 int _PyInterpreterFrame_GetLine(_PyInterpreterFrame *frame);
 
-#endif
+#endif

src/vmp_stack.h

@@ -4,7 +4,13 @@
 
 #ifndef RPYTHON_VMPROF
   #if PY_VERSION_HEX >= 0x030b00f0 /* >= 3.11 */
+  #define PY_BUILD_CORE
+  #if PY_VERSION_HEX >= 0x030E0000 /* >= 3.14 */
+  #include "internal/pycore_interpframe.h"
+  #else
   #include "internal/pycore_frame.h"
+  #endif
+  #undef PY_BUILD_CORE
   #include "populate_frames.h"
   #endif
 #endif

vmprof/cli.py

@@ -118,7 +118,7 @@ class IniParser(object):
 
     def __init__(self, f):
         self.ini_parser = configparser.ConfigParser()
-        self.ini_parser.readfp(f)
+        self.ini_parser.read_file(f)
 
     def get_option(self, name, type, default=None):
         if type == float:

vmprof/test/test_run.py

@@ -199,8 +199,13 @@ def test_nested_call():
     assert len(t.children) == 1
     assert 'function_foo' in t[''].name
     if PY3K:
-        assert len(t[''].children) == 1
-        assert '<listcomp>' in t[''][''].name
+        # In Python 3.12+, list comprehensions are inlined and don't create
+        # a separate stack frame (PEP 709), so <listcomp> won't appear
+        if sys.version_info >= (3, 12):
+            assert len(t[''].children) == 0
+        else:
+            assert len(t[''].children) == 1
+            assert '<listcomp>' in t[''][''].name
     else:
         assert len(t[''].children) == 0