Fix Python expect data

Fixes the expected output data for python and adds a script to
automatically regenerate the expected data to make it easier in the
future

tests/expect/make_expect.py

@@ -0,0 +1,42 @@
+#! /usr/bin/env python3
+#
+# Copyright (c) 2024 Joshua Watt
+#
+# SPDX-License-Identifier: MIT
+
+import sys
+import subprocess
+
+from pathlib import Path
+
+THIS_DIR = Path(__file__).parent
+DATA_DIR = THIS_DIR.parent / "data"
+
+
+def make_dest(src, lang, ext):
+    return THIS_DIR / lang / (src.stem + ext)
+
+
+def main():
+    for src in DATA_DIR.iterdir():
+        if not src.is_file():
+            continue
+
+        if not src.name.endswith(".jsonld"):
+            continue
+
+        for lang, ext in (("python", ".py"), ("raw", ".txt")):
+            subprocess.run(
+                [
+                    "shacl2code",
+                    "generate",
+                    f"--input={src}",
+                    lang,
+                    f"--output={make_dest(src, lang, ext)}",
+                ],
+                check=True,
+            )
+
+
+if __name__ == "__main__":
+    sys.exit(main())

tests/expect/python/spdx3.py

@@ -488,20 +488,20 @@ def serializer(self):
             if prop.elide(value):
                 if min_count:
                     raise ValueError(
-                        f"Property '{pyname}' in {self.__class__.__name__} is required (currently {value!r})"
+                        f"Property '{pyname}' in {self.__class__.__name__} ({id(self)}) is required (currently {value!r})"
                     )
                 continue
 
             if min_count is not None:
                 if not prop.check_min_count(value, min_count):
                     raise ValueError(
-                        f"Property '{pyname}' in {self.__class__.__name__} requires a minimum of {min_count} elements"
+                        f"Property '{pyname}' in {self.__class__.__name__} ({id(self)}) requires a minimum of {min_count} elements"
                     )
 
             if max_count is not None:
                 if not prop.check_max_count(value, max_count):
                     raise ValueError(
-                        f"Property '{pyname}' in {self.__class__.__name__} requires a maximum of {max_count} elements"
+                        f"Property '{pyname}' in {self.__class__.__name__} ({id(self)}) requires a maximum of {max_count} elements"
                     )
 
             d[json_name] = prop.serializer(value)

tests/test_python.py

@@ -11,7 +11,7 @@
 THIS_FILE = Path(__file__)
 THIS_DIR = THIS_FILE.parent
 
-SPDX3_MODEL = THIS_DIR / "data" / "spdx3-model.jsonld"
+SPDX3_MODEL = THIS_DIR / "data" / "spdx3.jsonld"
 SPDX3_EXPECT = THIS_DIR / "expect" / "python" / "spdx3.py"
 
 

tests/test_raw.py

@@ -14,7 +14,7 @@
 THIS_FILE = Path(__file__)
 THIS_DIR = THIS_FILE.parent
 
-SPDX3_MODEL = THIS_DIR / "data" / "spdx3-model.jsonld"
+SPDX3_MODEL = THIS_DIR / "data" / "spdx3.jsonld"
 SPDX3_EXPECT = THIS_DIR / "expect" / "raw" / "spdx3.txt"