Merge pull request #26 from metno/23-add-strict-argument-to-make-shou…

…ld-shall

23 add strict argument to make should shall

sedr/rodeoprofile10.py

@@ -67,7 +67,7 @@ def requirement7_2(jsondata: str) -> tuple[bool, str]:
 
 def requirement7_3(jsondata) -> tuple[bool, str]:
     """Check collection identifier. Can only test B, C.
-    This should only be tested if --strict is set."""
+    Should only be tested if --strict is set."""
     spec_url = f"{spec_base_url}#_collection_identifier"
     approved_data_types = [
         "insitu-observations",
@@ -116,7 +116,7 @@ def requirement7_4(jsondata: str) -> tuple[bool, str]:
         # A
         return (
             False,
-            f"Collection must have a title. Error {err}. See <{spec_url}> and {spec_base_url}#_collection_title_2 for more info.",
+            f"Collection must have a title, but it seems to be missing. See <{spec_url}> and {spec_base_url}#_collection_title_2 for more info.",
         )
     return (
         True,

sedr/schemat.py

@@ -230,11 +230,12 @@ def test_edr_collections(case):
                 ) from err
 
         if use_rodeoprofile:
-            requirement7_3, requirement7_3_message = rodeoprofile.requirement7_3(
-                jsondata=collection
-            )
-            if not requirement7_3:
-                raise AssertionError(requirement7_3_message)
+            if util.args.strict:
+                requirement7_3, requirement7_3_message = rodeoprofile.requirement7_3(
+                    jsondata=collection
+                )
+                if not requirement7_3:
+                    raise AssertionError(requirement7_3_message)
 
             requirement7_4, requirement7_4_message = rodeoprofile.requirement7_4(
                 jsondata=collection

sedr/util.py

@@ -49,6 +49,12 @@ def parse_args(args, version: str = "") -> argparse.Namespace:
         default=False,
         help="Use the rodeo profile even though the API doesn't specify it. Default False.",
     )
+    parser.add_argument(
+        "--strict",
+        action="store_true",
+        default=False,
+        help="Treat SHOULD in any profile as SHALL. Default False.",
+    )
 
     args = parser.parse_args(args)
     # Parse out base_path for convenience