0afdff9fae
(listed in root-config --libs) Rename root-fonts package to root-font-files Add optional test dependency python3-pandas now available in EPEL 10 Add dependency jupyter-notebook to root-jupyroot for EPEL 10.1 and later Fix Python 3.14 refcount issues in tests
66 lines
3.1 KiB
Diff
66 lines
3.1 KiB
Diff
From f26668d48bfc75e9c176f7981e51ddc3b5ed7895 Mon Sep 17 00:00:00 2001
|
|
From: Jonas Rembser <jonas.rembser@cern.ch>
|
|
Date: Wed, 11 Jun 2025 14:15:07 +0200
|
|
Subject: [PATCH] [Python] Update reference refcount values for Python 3.14
|
|
compatibility
|
|
|
|
Closes: #18988.
|
|
---
|
|
.../pyroot/pythonizations/test/rdataframe_makenumpy.py | 9 ++++++++-
|
|
bindings/pyroot/pythonizations/test/rvec_asrvec.py | 10 +++++++---
|
|
2 files changed, 15 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
|
|
index 072148aeb6..c7da723523 100644
|
|
--- a/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
|
|
+++ b/bindings/pyroot/pythonizations/test/rdataframe_makenumpy.py
|
|
@@ -75,10 +75,17 @@ class DataFrameFromNumpy(unittest.TestCase):
|
|
def test_refcount(self):
|
|
"""
|
|
Check refcounts of associated PyObjects
|
|
+
|
|
+ In case of Python <=3.14, we expect a refcount of 2 for the data dict,
|
|
+ because the call to sys.getrefcount creates a second reference by
|
|
+ itself. Starting from Python 3.14, we expect a refcount of 1 because
|
|
+ there were changes to the interpreter to avoid some unnecessary ref
|
|
+ counts. See also:
|
|
+ https://docs.python.org/3.14/whatsnew/3.14.html#whatsnew314-refcount
|
|
"""
|
|
data = {"x": np.array([1, 2, 3], dtype="float32")}
|
|
gc.collect()
|
|
- self.assertEqual(sys.getrefcount(data), 2)
|
|
+ self.assertEqual(sys.getrefcount(data), 1 + int(sys.version_info < (3, 14)))
|
|
self.assertEqual(sys.getrefcount(data["x"]), 2)
|
|
|
|
df = ROOT.RDF.FromNumpy(data)
|
|
diff --git a/bindings/pyroot/pythonizations/test/rvec_asrvec.py b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
|
|
index 5e6c820705..9d3a294bf1 100644
|
|
--- a/bindings/pyroot/pythonizations/test/rvec_asrvec.py
|
|
+++ b/bindings/pyroot/pythonizations/test/rvec_asrvec.py
|
|
@@ -123,8 +123,12 @@ class AsRVec(unittest.TestCase):
|
|
"""
|
|
Test reference count of returned RVec
|
|
|
|
- We expect a refcount of 2 for the RVec because the call to sys.getrefcount
|
|
- creates a second reference by itself.
|
|
+ In case of Python <=3.14, we expect a refcount of 2 for the RVec
|
|
+ because the call to sys.getrefcount creates a second reference by
|
|
+ itself. Starting from Python 3.14, we expect a refcount of 1 because
|
|
+ there were changes to the interpreter to avoid some unnecessary ref
|
|
+ counts. See also:
|
|
+ https://docs.python.org/3.14/whatsnew/3.14.html#whatsnew314-refcount
|
|
We attach the adopted pyobject to the RVec and increase the refcount of the
|
|
numpy array. After deletion of the rvec, the refcount of the numpy array
|
|
is decreased.
|
|
@@ -132,7 +136,7 @@ class AsRVec(unittest.TestCase):
|
|
np_obj = np.array([1, 2])
|
|
rvec = ROOT.VecOps.AsRVec(np_obj)
|
|
gc.collect()
|
|
- self.assertEqual(sys.getrefcount(rvec), 2)
|
|
+ self.assertEqual(sys.getrefcount(rvec), 1 + int(sys.version_info < (3, 14)))
|
|
self.assertEqual(sys.getrefcount(np_obj), 3)
|
|
del rvec
|
|
gc.collect()
|
|
--
|
|
2.49.0
|
|
|