Skip to content

Updated the submodule commits #1334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VisLab merged 2 commits into from
Jun 23, 2026
Merged

Updated the submodule commits #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
365fb7e
Updated the submodule commits
VisLab Jun 22, 2026
bf54d80
Updated the testlib for the tests
VisLab Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,542 changes: 0 additions & 6,542 deletions hed/schema/schema_data/HED_testlib_1.0.2.xml
View file
Open in desktop

This file was deleted.

7,459 changes: 0 additions & 7,459 deletions hed/schema/schema_data/HED_testlib_2.0.0.xml
View file
Open in desktop

This file was deleted.

7,426 changes: 0 additions & 7,426 deletions hed/schema/schema_data/HED_testlib_2.1.0.xml
View file
Open in desktop

This file was deleted.

7,407 changes: 0 additions & 7,407 deletions hed/schema/schema_data/HED_testlib_3.0.0.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion spec_tests/hed-schemas
Open in desktop
Submodule hed-schemas updated 39 files
+17 −1 README.md
+4,098 −0 library_schemas/lang/hedjson/HED_lang_1.0.0.json
+3,062 −24,026 library_schemas/lang/hedjson/HED_lang_1.1.0.json
+3,062 −24,026 library_schemas/lang/prerelease/HED_lang_1.2.0.json
+13,597 −89 library_schemas/mouse/prerelease/HED_mouse_1.0.0.xml
+2 −2 library_schemas/testlib/hedjson/HED_testlib_2.0.0.json
+6 −6 library_schemas/testlib/hedjson/HED_testlib_2.1.0.json
+1 −1 library_schemas/testlib/hedjson/HED_testlib_3.0.0.json
+2 −2 library_schemas/testlib/hedtsv/HED_testlib_2.0.0/HED_testlib_2.0.0_Structure.tsv
+2 −2 library_schemas/testlib/hedtsv/HED_testlib_2.1.0/HED_testlib_2.1.0_Structure.tsv
+4 −4 library_schemas/testlib/hedtsv/HED_testlib_2.1.0/HED_testlib_2.1.0_Tag.tsv
+1 −1 library_schemas/testlib/hedtsv/HED_testlib_3.0.0/HED_testlib_3.0.0_Structure.tsv
+2 −2 library_schemas/testlib/hedwiki/HED_testlib_2.0.0.mediawiki
+6 −6 library_schemas/testlib/hedwiki/HED_testlib_2.1.0.mediawiki
+30 −0 library_schemas/testlib/hedwiki/HED_testlib_2.2.0.mediawiki
+18 −18 library_schemas/testlib/hedwiki/HED_testlib_3.0.0.mediawiki
+6,495 −353 library_schemas/testlib/hedxml/HED_testlib_2.0.0.xml
+6,496 −357 library_schemas/testlib/hedxml/HED_testlib_2.1.0.xml
+13,475 −0 library_schemas/testlib/hedxml/HED_testlib_2.2.0.xml
+6,495 −353 library_schemas/testlib/hedxml/HED_testlib_3.0.0.xml
+13,474 −25 library_schemas/testlib/prerelease/HED_testlib_4.0.0.xml
+5 −0 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_AnnotationProperty.tsv
+14 −0 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_AttributeProperty.tsv
+14 −0 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_DataProperty.tsv
+6 −0 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_ObjectProperty.tsv
+1 −1 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_Structure.tsv
+1,240 −7 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_Tag.tsv
+47 −1 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_Unit.tsv
+16 −0 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_UnitClass.tsv
+40 −0 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_UnitModifier.tsv
+5 −0 library_schemas/testlib/prerelease/hedtsv/HED_testlib_4.0.0/HED_testlib_4.0.0_ValueClass.tsv
+3,344 −0 schemas_xml_unmerged/HED_lang_1.2.0.xml
+317 −0 schemas_xml_unmerged/HED_mouse_1.0.0.xml
+335 −0 schemas_xml_unmerged/HED_slam_1.0.0.xml
+2 −2 schemas_xml_unmerged/HED_testlib_2.0.0.xml
+1 −1 schemas_xml_unmerged/HED_testlib_2.1.0.xml
+34 −0 schemas_xml_unmerged/HED_testlib_2.2.0.xml
+1 −1 schemas_xml_unmerged/HED_testlib_3.0.0.xml
+78 −0 schemas_xml_unmerged/HED_testlib_4.0.0.xml
16 changes: 8 additions & 8 deletions tests/schema/test_hed_schema_io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ def test_load_schema_version(self):
self.assertEqual(schemas3.name, "base:8.0.0")

def test_load_schema_version_merged(self):
ver4 = ["testlib_2.0.0", "score_1.1.0"]
ver4 = ["testlib_2.0.0", "score_2.1.0"]
schemas3 = load_schema_version(ver4)
issues = schemas3.check_compliance()
self.assertIsInstance(schemas3, HedSchema, "load_schema_version returns HedSchema version+namespace")
self.assertTrue(schemas3.version_number, "load_schema_version has the right version with namespace")
self.assertEqual(schemas3.schema_namespace, "", "load_schema_version has the right version with namespace")
self.assertEqual(schemas3.name, "testlib_2.0.0,score_1.1.0")
self.assertEqual(schemas3.version, "testlib_2.0.0,score_1.1.0")
self.assertEqual(schemas3.name, "testlib_2.0.0,score_2.1.0")
self.assertEqual(schemas3.version, "testlib_2.0.0,score_2.1.0")
# Deprecated tag warnings + character issues from SCORE prologue/epilogue
self.assertEqual(len(issues), 31)

Expand Down Expand Up @@ -116,10 +116,10 @@ def test_load_and_verify_tags(self):
testlib = load_schema_version("testlib_2.0.0")

# Load 'score' by itself
score = load_schema_version("score_1.1.0")
score = load_schema_version("score_2.1.0")

# Load both 'testlib' and 'score' together
schemas3 = load_schema_version(["testlib_2.0.0", "score_1.1.0"])
schemas3 = load_schema_version(["testlib_2.0.0", "score_2.1.0"])

# Extract the tag names from each library
testlib_tags = set(testlib.tags.all_names.keys())
Expand Down Expand Up @@ -267,7 +267,7 @@ def test_load_schema_version(self):
self.assertEqual(schemas3._namespace, "base:", "load_schema_version has the right version with namespace")

def test_load_schema_version_merged(self):
ver4 = ["testlib_2.0.0", "score_1.1.0"]
ver4 = ["testlib_2.0.0", "score_2.1.0"]
schemas3 = load_schema_version(ver4)
issues = schemas3.check_compliance()
self.assertIsInstance(schemas3, HedSchema, "load_schema_version returns HedSchema version+namespace")
Expand All @@ -286,10 +286,10 @@ def test_load_and_verify_tags(self):
testlib = load_schema_version("testlib_2.0.0")

# Load 'score' by itself
score = load_schema_version("score_1.1.0")
score = load_schema_version("score_2.1.0")

# Load both 'testlib' and 'score' together
schemas3 = load_schema_version(["testlib_2.0.0", "score_1.1.0"])
schemas3 = load_schema_version(["testlib_2.0.0", "score_2.1.0"])

# Extract the tag names from each library
testlib_tags = set(testlib.tags.all_names.keys())
Expand Down
8 changes: 4 additions & 4 deletions tests/schema/test_schema_validation_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ def test_schema_version_for_library(self):
self.assertEqual(util.schema_version_for_library(schema2, ""), "8.3.0")
self.assertEqual(util.schema_version_for_library(schema2, None), "8.3.0")

schema3 = load_schema_version(["testlib_2.0.0", "score_1.1.0"])
self.assertEqual(util.schema_version_for_library(schema3, ""), "8.2.0")
self.assertEqual(util.schema_version_for_library(schema3, None), "8.2.0")
self.assertEqual(util.schema_version_for_library(schema3, "score"), "1.1.0")
schema3 = load_schema_version(["testlib_2.0.0", "score_2.1.0"])
self.assertEqual(util.schema_version_for_library(schema3, ""), "8.4.0")
self.assertEqual(util.schema_version_for_library(schema3, None), "8.4.0")
self.assertEqual(util.schema_version_for_library(schema3, "score"), "2.1.0")
self.assertEqual(util.schema_version_for_library(schema3, "testlib"), "2.0.0")

self.assertEqual(util.schema_version_for_library(schema3, "badlib"), None)
6 changes: 3 additions & 3 deletions tests/schema/test_schema_validator_hed_id.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ def test_constructor(self):
self.assertTrue(id_validator.library_data[""])
self.assertTrue(id_validator._previous_schemas["testlib"])
self.assertEqual(id_validator.library_data.get("testlib"), None)
self.assertEqual(id_validator._previous_schemas["testlib"].version_number, "2.1.0")
self.assertEqual(id_validator._previous_schemas[""].version_number, "8.1.0")
self.assertEqual(id_validator._previous_schemas["testlib"].version_number, "2.2.0")
self.assertEqual(id_validator._previous_schemas[""].version_number, "8.3.0")

def test_get_previous_version(self):
self.assertEqual(HedIDValidator._get_previous_version("8.3.0", ""), "8.2.0")
self.assertEqual(HedIDValidator._get_previous_version("8.2.0", ""), "8.1.0")
self.assertEqual(HedIDValidator._get_previous_version("8.0.0", ""), None)
self.assertEqual(HedIDValidator._get_previous_version("3.0.0", "testlib"), "testlib_2.1.0")
self.assertEqual(HedIDValidator._get_previous_version("3.0.0", "testlib"), "testlib_2.2.0")

def test_verify_tag_id(self):
event_entry = self.hed_schema84.tags["Event"]
Expand Down