c2pa-python 0.37.10__tar.gz → 0.37.12__tar.gz

{c2pa_python-0.37.10/src/c2pa_python.egg-info → c2pa_python-0.37.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c2pa-python
-Version: 0.37.10
+Version: 0.37.12
 Summary: Python bindings for the C2PA Content Authenticity Initiative (CAI) library
 Author-email: Gavin Peacock <gvnpeacock@adobe.com>, Tania Mathern <mathern@adobe.com>
 Maintainer-email: Gavin Peacock <gpeacock@adobe.com>, Tania Mathern <mathern@adobe.com>

{c2pa_python-0.37.10 → c2pa_python-0.37.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "c2pa-python"
-version = "0.37.10"
+version = "0.37.12"
 requires-python = ">=3.10"
 description = "Python bindings for the C2PA Content Authenticity Initiative (CAI) library"
 readme = { file = "README.md", content-type = "text/markdown" }

{c2pa_python-0.37.10 → c2pa_python-0.37.12}/src/c2pa/c2pa.py

@@ -11,7 +11,7 @@
 # specific language governing permissions and limitations under
 # each license.
 
-# Version: 0.37.10
+# Version: 0.37.12
 
 import ctypes
 import enum

{c2pa_python-0.37.10 → c2pa_python-0.37.12/src/c2pa_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c2pa-python
-Version: 0.37.10
+Version: 0.37.12
 Summary: Python bindings for the C2PA Content Authenticity Initiative (CAI) library
 Author-email: Gavin Peacock <gvnpeacock@adobe.com>, Tania Mathern <mathern@adobe.com>
 Maintainer-email: Gavin Peacock <gpeacock@adobe.com>, Tania Mathern <mathern@adobe.com>

{c2pa_python-0.37.10 → c2pa_python-0.37.12}/tests/test_unit_tests.py

@@ -76,16 +76,27 @@ def load_test_settings_json():
 
 def parse_native_version():
     """
-    Parse the expected native SDK version from c2pa-native-version.txt.
+    Parse the expected native SDK version.
+
+    Reads c2pa-rs-preflight-ref.txt instead of c2pa-native-version.txt when
+    C2PA_PREFLIGHT_RUN is set: that flag is set only by
+    test-c2pa-rs-source-build.yml's own "Run tests" step, because the
+    presence of c2pa-rs-preflight-ref.txt in the checked-out tree isn't by
+    itself proof of anything -- an ordinary build.yml run on a branch that
+    happens to carry that file (e.g. this PR) still downloads and installs
+    the real pinned release, not the preflight ref.
 
     Returns:
         str: The semantic version string (e.g. "0.85.2").
     """
     repo_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    version_path = os.path.join(repo_root, 'c2pa-native-version.txt')
-    with open(version_path, 'r') as f:
+    if os.environ.get('C2PA_PREFLIGHT_RUN'):
+        path = os.path.join(repo_root, 'c2pa-rs-preflight-ref.txt')
+    else:
+        path = os.path.join(repo_root, 'c2pa-native-version.txt')
+    with open(path, 'r') as f:
         raw = f.read().strip()
-    # Strip the "c2pa-v" prefix to get the bare semantic version.
+    # Strip the "c2pa-v" / "c2pa-rc-v" prefix to get the bare semantic version.
     return raw.split('v', 1)[1] if 'v' in raw else raw
 
 
@@ -2629,7 +2640,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_add_ingredient_from_archive_roundtrip(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "0.1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         builder = Builder.from_json(manifest)
         ingredient_json = {
@@ -2662,7 +2683,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_add_ingredient_from_archive_preserves_instance_id(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "0.1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         archive_builder = Builder.from_json(manifest)
         ingredient_json = {
@@ -2695,7 +2726,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_add_ingredient_from_archive_preserves_instance_id_component_of(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         archive_builder = Builder.from_json(manifest)
         ingredient_json = {
@@ -2729,7 +2770,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_add_ingredient_from_archive_preserves_instance_id_input_to(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         archive_builder = Builder.from_json(manifest)
         ingredient_json = {
@@ -2763,7 +2814,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_add_ingredient_from_archive_roundtrip_parent_of(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         builder = Builder.from_json(manifest)
         ingredient_json = {
@@ -2797,7 +2858,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_add_ingredient_from_archive_roundtrip_input_to(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         builder = Builder.from_json(manifest)
         ingredient_json = {
@@ -2963,7 +3034,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_add_two_ingredient_archives_to_one_builder(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         archives = []
         for title, instance_id in [("A.jpg", "ingredient-A"), ("B.jpg", "ingredient-B")]:
@@ -3001,7 +3082,17 @@ class TestBuilderWithSigner(unittest.TestCase):
     def test_write_ingredient_archive_only_contains_requested_ingredient(self):
         manifest = {
             "claim_generator_info": [{"name": "c2pa-test", "version": "1.0"}],
-            "assertions": [],
+            "assertions": [
+                {
+                    "label": "c2pa.actions",
+                    "data": {
+                        "actions": [{
+                            "action": "c2pa.created",
+                            "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                        }]
+                    }
+                }
+            ],
         }
         archive_builder = Builder.from_json(manifest)
         for title, instance_id in [("A.jpg", "ingredient-A"), ("B.jpg", "ingredient-B")]:
@@ -3444,7 +3535,7 @@ class TestBuilderWithSigner(unittest.TestCase):
         # Test adding another ingredient
         ingredient_json = '{"test": "ingredient2"}'
         with open(self.testPath2, 'rb') as f:
-            builder.add_ingredient(ingredient_json, "image/png", f)
+            builder.add_ingredient(ingredient_json, "image/jpeg", f)
 
         builder.close()
 
@@ -3464,7 +3555,7 @@ class TestBuilderWithSigner(unittest.TestCase):
         # Test adding another ingredient with a JSON string
         ingredient_json = '{"test": "ingredient2"}'
         with open(self.testPath2, 'rb') as f:
-            builder.add_ingredient(ingredient_json, "image/png", f)
+            builder.add_ingredient(ingredient_json, "image/jpeg", f)
 
         builder.close()
 
@@ -3493,7 +3584,7 @@ class TestBuilderWithSigner(unittest.TestCase):
 
         ingredient_json = '{"test": "ingredient2"}'
         with open(self.testPath2, 'rb') as f:
-            builder.add_ingredient(ingredient_json, "image/png", f)
+            builder.add_ingredient(ingredient_json, "image/jpeg", f)
 
         builder.close()
 
@@ -3551,7 +3642,7 @@ class TestBuilderWithSigner(unittest.TestCase):
 
         ingredient_json = '{"test": "ingredient2"}'
         with open(self.testPath2, 'rb') as f:
-            builder.add_ingredient(ingredient_json, "image/png", f)
+            builder.add_ingredient(ingredient_json, "image/jpeg", f)
 
         builder.close()
 
@@ -5546,6 +5637,10 @@ class TestBuilderWithSigner(unittest.TestCase):
                     "label": "c2pa.actions.v2",
                     "data": {
                         "actions": [
+                            {
+                                "action": "c2pa.created",
+                                "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                            },
                             {
                                 "action": "c2pa.placed",
                                 "parameters": {
@@ -5689,16 +5784,16 @@ class TestBuilderWithSigner(unittest.TestCase):
                     "data": {
                         "actions": [
                             {
-                                "action": "c2pa.placed",
+                                "action": "c2pa.opened",
+                                "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/digitalCreation",
                                 "parameters": {
-                                    "ingredientIds": ["ingredient-for-placed"]
+                                    "ingredientIds": ["ingredient-for-opened"]
                                 },
                             },
                             {
-                                "action": "c2pa.opened",
-                                "digitalSourceType": "http://cv.iptc.org/newscodes/digitalsourcetype/digitalCreation",
+                                "action": "c2pa.placed",
                                 "parameters": {
-                                    "ingredientIds": ["ingredient-for-opened"]
+                                    "ingredientIds": ["ingredient-for-placed"]
                                 },
                             },
                         ]
@@ -5781,6 +5876,10 @@ class TestBuilderWithSigner(unittest.TestCase):
                     "label": "c2pa.actions.v2",
                     "data": {
                         "actions": [
+                            {
+                                "action": "c2pa.created",
+                                "digitalSourceType": "http://c2pa.org/digitalsourcetype/empty",
+                            },
                             {
                                 "action": "c2pa.placed",
                                 "parameters": {
@@ -8539,9 +8638,13 @@ class TestManagedResourceObjects(TestContextAPIs):
         builder.close()
         builder.close()
 
-        # Only the replacement is must be freed here.
+        # The replacement must be freed exactly once; a second close() is a
+        # no-op. We don't separately assert original_handle's count here: the
+        # native allocator may legally reuse the just-freed original address
+        # for the replacement Box (same-size free-then-alloc within one FFI
+        # call), so swapped_handle and original_handle can be the same
+        # pointer value. The check above already covers that case correctly.
         self.assertEqual(self._free_count(freed, swapped_handle), 1)
-        self.assertEqual(self._free_count(freed, original_handle), 0)
 
     def test_repeated_swaps_on_one_builder(self):
         # Each with_archive consumes the handle the previous one returned, so