Merge branch 'validate-multiple-instances' into 1000-jstore-cleanup

Author: jesper-friis

bindings/python/dlite-jstore-python.i

@@ -31,7 +31,7 @@ def format_dict(
 
     Notes:
         This method works with the dict-representation and does not
-        access instances.  The only exception is when `d` correspond to
+        access instances.  The only exception is when `d` corresponds to
         a data instance who's dimensions is a list of dimension lengths.
         In this case is the metadata needed to get dimension names.
 

bindings/python/tests/test_jstore.py

@@ -14,15 +14,15 @@
 
 
 # Test format_dict(), arg: soft7
-D1 = {
+D1 = {  # soft7 representation
     "uri": "http://onto-ns.com/meta/ex/0.2/Test",
     "dimensions": {"n": "number of something"},
     "properties": {
         "a": {"type": "string"},
         "b": {"type": "float64", "shape": ["n"]},
     },
 }
-D2 = {
+D2 = {  # old (array) representation
     "uri": "http://onto-ns.com/meta/ex/0.2/Test",
     "dimensions": [{"name": "n", "description": "number of something"}],
     "properties": [
@@ -35,6 +35,8 @@
 assert dlite.format_dict(D2, soft7=True) == D1
 assert dlite.format_dict(D2, soft7=False) == D2
 
+# soft7 representation.  This is identical to the old representation for
+# data instances
 d1 = {
     "uuid": "d6a1c1db-44b6-5b87-b815-83f1127395b6",
     "meta": "http://onto-ns.com/meta/ex/0.2/Test",
@@ -44,7 +46,7 @@
         "b": [1.1, 2.2, 3.3],
     },
 }
-d2 = {
+d2 = {  # old representation
     "uuid": "d6a1c1db-44b6-5b87-b815-83f1127395b6",
     "meta": "http://onto-ns.com/meta/ex/0.2/Test",
     "dimensions": {"n": 3},

requirements_doc.txt

@@ -1,5 +1,4 @@
 importlib-metadata==6.8.0; python_version<'3.8'
-
 beautifulsoup4==4.12.3
 breathe==4.35.0
 docutils==0.21.2