Merge remote-tracking branch 'origin/main' into dev/drop-support-for-…

…python-37
enthought · Mar 4, 2024 · 61320a7 · 61320a7
2 parents 1fff616 + a20f215
commit 61320a7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/run-core-traits-tests.yml b/.github/workflows/run-core-traits-tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
 
     runs-on: ${{ matrix.os }}
 

diff --git a/traits/ctraits.c b/traits/ctraits.c
@@ -808,10 +808,10 @@ static void
 has_traits_dealloc(has_traits_object *obj)
 {
     PyObject_GC_UnTrack(obj);
-    Py_TRASHCAN_SAFE_BEGIN(obj);
+    Py_TRASHCAN_BEGIN(obj, has_traits_dealloc);
     has_traits_clear(obj);
     Py_TYPE(obj)->tp_free((PyObject *)obj);
-    Py_TRASHCAN_SAFE_END(obj);
+    Py_TRASHCAN_END
 }
 
 /*-----------------------------------------------------------------------------
@@ -3006,10 +3006,18 @@ static void
 trait_dealloc(trait_object *trait)
 {
     PyObject_GC_UnTrack(trait);
+#if PY_VERSION_HEX < 0x03080000
     Py_TRASHCAN_SAFE_BEGIN(trait);
+#else
+    Py_TRASHCAN_BEGIN(trait, trait_dealloc);
+#endif
     trait_clear(trait);
     Py_TYPE(trait)->tp_free((PyObject *)trait);
+#if PY_VERSION_HEX < 0x03080000
     Py_TRASHCAN_SAFE_END(trait);
+#else
+    Py_TRASHCAN_END
+#endif
 }
 
 /*-----------------------------------------------------------------------------