Skip to content

Commit 5cb1421

Browse files
VisLabVisLab
committed
Updated the schema
1 parent b25bc05 commit 5cb1421

8 files changed

Lines changed: 248 additions & 294 deletions

File tree

‎hed/schema/hed_schema.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ def get_as_json_string(self, save_merged=True) -> str:
325325
326326
"""
327327
from hed.schema.schema_io.schema2json import Schema2JSON
328+
328329
converter = Schema2JSON()
329330
converter.process_schema(self, save_merged)
330331
return converter.to_json_string()

‎hed/schema/schema_io/json2schema.py‎

Lines changed: 113 additions & 108 deletions
Large diffs are not rendered by default.

‎hed/schema/schema_io/schema2json.py‎

Lines changed: 130 additions & 105 deletions
Large diffs are not rendered by default.

‎hed/scripts/convert_and_update_schema.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ def convert_and_update(filenames, set_ids):
5959
schema_reloaded = from_dataframes(result)
6060
schema_reloaded.save_as_mediawiki(basename + ".mediawiki")
6161
schema_reloaded.save_as_xml(basename + ".xml")
62+
schema_reloaded.save_as_json(basename + ".json")
6263

6364
save_dataframes(source_df_filename, result)
6465
updated.append(basename)

‎hed/scripts/script_util.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from hed.errors import get_printable_issue_string, HedFileError, SchemaWarnings
55
from hed.schema.schema_comparer import SchemaComparer
66

7-
all_extensions = [".tsv", ".mediawiki", ".xml"]
7+
all_extensions = [".tsv", ".mediawiki", ".xml", ".json"]
88

99

1010
def validate_schema_object(base_schema, schema_name):

‎temp.py‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎tests/scripts/debug_convert_test.py‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎tests/scripts/test_script_util.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def setUpClass(cls):
122122
cls.basename = "test_schema"
123123

124124
def test_error_no_error(self):
125-
"""Test the function with correctly saved schemas in all three formats."""
125+
"""Test the function with correctly saved schemas in all four formats."""
126126
# Load specific schema versions and save them correctly
127127
schema = load_schema_version("8.4.0")
128128
schema.save_as_xml(os.path.join(self.base_path, self.basename + ".xml"))
@@ -132,6 +132,7 @@ def test_error_no_error(self):
132132
self.assertTrue(issues)
133133
self.assertEqual(issues[0], "Error loading schema: No such file or directory")
134134
schema.save_as_mediawiki(os.path.join(self.base_path, self.basename + ".mediawiki"))
135+
schema.save_as_json(os.path.join(self.base_path, self.basename + ".json"))
135136

136137
with contextlib.redirect_stdout(None):
137138
self.assertEqual(validate_all_schema_formats(os.path.join(self.base_path, self.basename)), [])

0 commit comments

Comments
 (0)