Remove strict requirement for valid axis units

ome · Feb 2, 2022 · 95c20ed · 95c20ed
1 parent 40a15df
commit 95c20ed
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 40 deletions.
diff --git a/0.4/examples/invalid/invalid_axis_units.json → ...lid_if_not_strict/invalid_axis_units.json b/0.4/examples/invalid/invalid_axis_units.json → ...lid_if_not_strict/invalid_axis_units.json
diff --git a/...examples/invalid/mismatch_axes_units.json → ...id_if_not_strict/mismatch_axes_units.json b/...examples/invalid/mismatch_axes_units.json → ...id_if_not_strict/mismatch_axes_units.json
diff --git a/0.4/schemas/image.schema b/0.4/schemas/image.schema
@@ -137,45 +137,7 @@
               },
               "type": {
                 "type": "string",
-                "enum": ["space"]
-              },
-              "units": {
-                "type": "string",
-                "enum": [
-                  "angstrom", "attometer", "centimeter", "decimeter", "exameter", "femtometer", "foot", "gigameter", "hectometer", "inch", "kilometer", "megameter", "meter", "micrometer", "mile", "millimeter", "nanometer", "parsec", "petameter", "picometer", "terameter", "yard", "yoctometer", "yottameter", "zeptometer", "zettameter"
-                ]
-              }
-            },
-            "required": ["name", "type"]
-          },
-          {
-            "type": "object",
-            "properties": {
-              "name": {
-                "type": "string"
-              },
-              "type": {
-                "type": "string",
-                "enum": ["time"]
-              },
-              "units": {
-                "type": "string",
-                "enum": [
-                  "attosecond", "centisecond", "day", "decisecond", "exasecond", "femtosecond", "gigasecond", "hectosecond", "hour", "kilosecond", "megasecond", "microsecond", "millisecond", "minute", "nanosecond", "petasecond", "picosecond", "second", "terasecond", "yoctosecond", "yottasecond", "zeptosecond", "zettasecond"
-                ]
-              }
-            },
-            "required": ["name", "type"]
-          },
-          {
-            "type": "object",
-            "properties": {
-              "name": {
-                "type": "string"
-              },
-              "type": {
-                "type": "string",
-                "enum": ["channel"]
+                "enum": ["channel", "time", "space"]
               }
             },
             "required": ["name", "type"]

diff --git a/0.4/tests/test_validation.py b/0.4/tests/test_validation.py
@@ -9,6 +9,7 @@
 
 def files():
     return list(glob.glob(f"examples/valid/*.json")) + \
+        list(glob.glob(f"examples/valid_if_not_strict/*.json")) + \
         list(glob.glob(f"examples/invalid/*.json"))
 
 def ids():
@@ -18,7 +19,7 @@ def ids():
 @pytest.mark.parametrize("testfile", files(), ids=ids())
 def test_json(testfile):
 
-    if "invalid" in testfile:
+    if "examples/invalid/" in testfile:
         with pytest.raises(ValidationError):
             json_schema(testfile)
     else: