Merge branch 'main' into workflow

Author: jim-easterbrook

tests/test_basicio.py

@@ -224,6 +224,8 @@ def test_MemIo(self):
         with self.assertWarns(DeprecationWarning):
             self.assertEqual(memoryview(io), self.data + b'+fred+jim')
 
+    @unittest.skipIf(sys.version_info >= (3, 14),
+                     'cannot test optimised ref counts')
     def test_ref_counts(self):
         # MemIo keeps a reference to the data buffer
         count = sys.getrefcount(self.data)

tests/test_exif.py

@@ -310,6 +310,8 @@ def test_pointers(self):
         self.assertEqual(datum_pointer, datum)
         self.assertEqual(datum_pointer, datum_iter)
 
+    @unittest.skipIf(sys.version_info >= (3, 14),
+                     'cannot test optimised ref counts')
     def test_ref_counts(self):
         self.image.readMetadata()
         # exifData keeps a reference to image

tests/test_image.py

@@ -1,6 +1,6 @@
 ##  python-exiv2 - Python interface to libexiv2
 ##  http://github.com/jim-easterbrook/python-exiv2
-##  Copyright (C) 2023-24  Jim Easterbrook  [email protected]
+##  Copyright (C) 2023-25  Jim Easterbrook  [email protected]
 ##
 ##  This program is free software: you can redistribute it and/or
 ##  modify it under the terms of the GNU General Public License as
@@ -121,17 +121,21 @@ def test_Image(self):
         self.check_result(image.iccProfileDefined(), bool, False)
         # test data access
         image.readMetadata()
-        self.assertEqual(sys.getrefcount(image), 2)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(image), 2)
         view = image.data()
-        self.assertEqual(sys.getrefcount(image), 3)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(image), 3)
         self.check_result(view, memoryview, self.image_data)
         self.assertEqual(view.readonly, True)
         image.writeMetadata()
-        self.assertEqual(sys.getrefcount(image), 2)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(image), 2)
         with self.assertRaises(ValueError):
             view[0]
         del view
-        self.assertEqual(sys.getrefcount(image), 2)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(image), 2)
         # test other methods
         image.readMetadata()
         self.check_result(image.byteOrder(),
@@ -183,6 +187,8 @@ def test_ImageFactory(self):
                           exiv2.ImageType, exiv2.ImageType.jpeg)
         self.assertIsInstance(factory.open(self.image_path), exiv2.Image)
 
+    @unittest.skipIf(sys.version_info >= (3, 14),
+                     'cannot test optimised ref counts')
     def test_ref_counts(self):
         # opening from data keeps reference to buffer
         self.assertEqual(sys.getrefcount(self.image_data), 2)

tests/test_iptc.py

@@ -204,6 +204,8 @@ def test_IptcDatum(self):
         del datum2
         self._test_datum(datum)
 
+    @unittest.skipIf(sys.version_info >= (3, 14),
+                     'cannot test optimised ref counts')
     def test_ref_counts(self):
         self.image.readMetadata()
         # iptcData keeps a reference to image

tests/test_preview.py

@@ -54,9 +54,11 @@ def test_PreviewImage(self):
         with preview.data() as data:
             self.check_result(data, memoryview, copy.data())
             self.assertEqual(data[:10], b'\xff\xd8\xff\xe0\x00\x10JFIF')
-        self.assertEqual(sys.getrefcount(preview), 3)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(preview), 3)
         del data
-        self.assertEqual(sys.getrefcount(preview), 2)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(preview), 2)
         with self.assertWarns(DeprecationWarning):
             self.assertEqual(memoryview(preview), copy.data())
         self.check_result(preview.extension(), str, '.jpg')
@@ -116,6 +118,8 @@ def test_PreviewProperties(self):
         with self.assertRaises(TypeError):
             properties['fred'] = 123
 
+    @unittest.skipIf(sys.version_info >= (3, 14),
+                     'cannot test optimised ref counts')
     def test_ref_counts(self):
         # manager keeps reference to image
         self.assertEqual(sys.getrefcount(self.image), 2)

tests/test_types.py

@@ -84,9 +84,11 @@ def test_DataBuf(self):
         with self.assertRaises(ValueError):
             view[0]
         view = buf.data()
-        self.assertEqual(sys.getrefcount(buf), 3)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(buf), 3)
         del view
-        self.assertEqual(sys.getrefcount(buf), 2)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(buf), 2)
 
     def test_Rational(self):
         for type_ in (exiv2.Rational, exiv2.URational):

tests/test_value.py

@@ -131,9 +131,11 @@ def do_common_string_tests(self, value, data):
         view = copy.data()
         self.assertIsInstance(view, memoryview)
         self.assertEqual(view[0], data[0])
-        self.assertEqual(sys.getrefcount(copy), 3)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(copy), 3)
         del view
-        self.assertEqual(sys.getrefcount(copy), 2)
+        if sys.version_info < (3, 14):
+            self.assertEqual(sys.getrefcount(copy), 2)
 
     def do_common_xmp_tests(self, value):
         with self.assertWarns(DeprecationWarning):
@@ -355,9 +357,11 @@ def check_data(value, data):
                 self.assertEqual(view, data)
             with self.assertRaises(ValueError):
                 self.assertEqual(view[0], data[0])
-            self.assertEqual(sys.getrefcount(value), 3)
+            if sys.version_info < (3, 14):
+                self.assertEqual(sys.getrefcount(value), 3)
             del view
-            self.assertEqual(sys.getrefcount(value), 2)
+            if sys.version_info < (3, 14):
+                self.assertEqual(sys.getrefcount(value), 2)
         else:
             copy = value.data()
             self.assertIsInstance(copy, bytearray)

tests/test_xmp.py

@@ -246,6 +246,8 @@ def test_pointers(self):
         self.assertEqual(datum_pointer, datum)
         self.assertEqual(datum_pointer, datum_iter)
 
+    @unittest.skipIf(sys.version_info >= (3, 14),
+                     'cannot test optimised ref counts')
     def test_ref_counts(self):
         self.image.readMetadata()
         # xmpData keeps a reference to image