Merge pull request #1450 from VisLab/remove_testlib

Drop the test dependencies on testlib

Author: VisLab

.rules/testing.md

@@ -36,6 +36,7 @@ tests/
   - `spec_tests/hed-examples/` - Example BIDS datasets
   - `spec_tests/hed-schemas/` - Official schema repository
 - Initialize: `git submodule update --init --recursive`
+- Unit tests that need a library schema use the hed-tests test schemas (testconflict, testclash, testminimal, testaux) from `spec_tests/hed-tests/json_test_data/test_schemas/hedxml/` through `tests/schema/util_test_schemas.py` (`load_test_schema`), never the deprecated testlib library; those tests skip when the submodule is not checked out. A test that needs a released library with a version history uses score.
 
 ## Running Tests
 

AGENTS.md

@@ -7,7 +7,7 @@ Purpose: core Python library for HED (Hierarchical Event Descriptors) validation
 Test framework: unittest. Never convert the suite to pytest style as a side effect of other work, and never mix the two.
 
 - Install dev env: `pip install -e ".[dev,test,docs,examples]"` (uv works: `uv venv .venv` then `uv pip install ...`)
-- Fetch test data: `git submodule update --init --recursive`
+- Fetch test data: `git submodule update --init --recursive` (the spec tests need it; the unit tests that load a library schema read the hed-tests test schemas from it and skip without it)
 - Run tests: `python -m unittest discover tests -v`
 - Spec tests (need submodules): `python -m unittest discover spec_tests -v`
 - Single test: `python -m unittest tests.models.test_hed_string.TestHedString.test_constructor`

hed/schema/hed_schema_io.py

@@ -322,8 +322,8 @@ def get_hed_xml_version(xml_file_path) -> str:
 def parse_version_list(xml_version_list) -> dict:
     """Takes a list of xml versions and returns a dictionary split by prefix
 
-        e.g. ["score", "testlib"] will return {"": "score, testlib"}
-        e.g. ["score", "testlib", "ol:otherlib"] will return {"": "score, testlib", "ol:": "otherlib"}
+        e.g. ["score", "lang"] will return {"": "score, lang"}
+        e.g. ["score", "lang", "ol:otherlib"] will return {"": "score, lang", "ol:": "otherlib"}
 
     Parameters:
         xml_version_list (list): List of str specifying which HED schemas to use

hed/schema/schema_io/wiki2schema.py

@@ -164,7 +164,7 @@ def parse_star_string(s):
         s = s.lstrip("* ").strip()  # remove leading '* ' and any surrounding whitespace
         result = {}
 
-        # Check for a leading schema-attribute block in {}, e.g. {inLibrary=testlib}
+        # Check for a leading schema-attribute block in {}, e.g. {inLibrary=score}
         if s.startswith("{"):
             end_brace = s.find("}")
             if end_brace >= 0:

hed/schema/schema_validation/attribute_validators.py

@@ -156,7 +156,7 @@ def unit_class_requires_numeric_check(hed_schema, tag_entry, attribute_name) ->
     that carries a unit class MUST have `valueClass=numericClass`. Standard schemas before 8.5.0 (and
     libraries partnered with them) are not checked: 8.3.0 and earlier have `Sampling-rate/#` with a unit
     class and no value class. An unpartnered library has no standard version and is not checked either
-    (testlib 1.0.2 and the testunpart fixture carry the same historical omission).
+    (the testunpart fixture carries the same historical omission).
 
     Parameters:
         hed_schema (HedSchema): The schema to use for validation.

spec_tests/test_hed_cache.py

@@ -131,12 +131,18 @@ def test_get_hed_version_path_no_auto_refresh_for_custom_directory(self):
     def test_get_hed_version_path_auto_refresh_downloads_missing_version(self):
         """get_hed_version_path downloads only the single requested version from GitHub.
 
-        Uses a testlib version, which is not bundled with hedtools, so the download must come from
-        GitHub rather than the local bundle. testlib lives in a normal ``hedxml/`` folder, so this
-        exercises the real on-demand download path (manifest fast path and REST API fallback alike)
-        without relying on deprecated versions. Only the listing for the relevant library and the
-        one XML file are fetched - not the entire catalog.
+        Uses score 1.2.0, a released library version that hedtools does not bundle in
+        ``hed/schema/schema_data/`` (the bundle has score 1.0.0, 1.1.0, 2.0.0 and 2.1.0), so seeding the
+        fresh cache with the bundle cannot satisfy the lookup and the file must come from GitHub. score
+        lives in a normal ``hedxml/`` folder, so this exercises the real on-demand download path (manifest
+        fast path and REST API fallback alike). Only the listing for the relevant library and the one XML
+        file are fetched - not the entire catalog.
         """
+        # Guard the premise: if this version is ever bundled, the test stops exercising the download.
+        self.assertFalse(
+            os.path.isfile(os.path.join(hed_cache.INSTALLED_CACHE_LOCATION, "HED_score_1.2.0.xml")),
+            "score 1.2.0 is now bundled; pick an unbundled released version for this test",
+        )
         # Use a fresh cache directory so the version is definitely not present
         fresh_cache = os.path.join(os.path.dirname(self.hed_cache_dir), "schema_cache_auto_refresh/")
         if os.path.exists(fresh_cache):
@@ -145,16 +151,22 @@ def test_get_hed_version_path_auto_refresh_downloads_missing_version(self):
         saved = hed_cache.HED_CACHE_DIRECTORY
         try:
             hed_cache.HED_CACHE_DIRECTORY = fresh_cache
-            # testlib 2.0.0 is a released library version that is NOT bundled - it must come from GitHub.
-            result = hed_cache.get_hed_version_path("2.0.0", library_name="testlib")
-            self.assertIsNotNone(result, "get_hed_version_path should download testlib 2.0.0 from GitHub on demand")
+            result = hed_cache.get_hed_version_path("1.2.0", library_name="score")
+            self.assertIsNotNone(result, "get_hed_version_path should download score 1.2.0 from GitHub on demand")
             self.assertTrue(os.path.exists(result))
-            # Only the one requested file should have been downloaded (plus any bundled schemas the
+            # Only the one requested file should have been downloaded (plus the bundled schemas the
             # cache seeds); no full-catalog download.
             xml_files = [f for f in os.listdir(fresh_cache) if hed_cache.version_pattern.match(f)]
-            self.assertTrue(
-                any("testlib" in f and "2.0.0" in f for f in xml_files),
-                f"HED_testlib_2.0.0.xml must be in the cache after on-demand download; found: {xml_files}",
+            self.assertIn(
+                "HED_score_1.2.0.xml",
+                xml_files,
+                f"HED_score_1.2.0.xml must be in the cache after on-demand download; found: {xml_files}",
+            )
+            bundled = set(os.listdir(hed_cache.INSTALLED_CACHE_LOCATION))
+            self.assertEqual(
+                [f for f in xml_files if f not in bundled],
+                ["HED_score_1.2.0.xml"],
+                "only the requested file should be downloaded; no full-catalog download",
             )
         finally:
             hed_cache.HED_CACHE_DIRECTORY = saved

tests/data/bids_tests/eeg_ds003645s_hed_library/dataset_description.json

@@ -1,7 +1,7 @@
 {
     "Name": "Face processing MEEG dataset with HED annotation",
     "BIDSVersion": "1.10.0",
-    "HEDVersion": ["score_2.0.0",  "test:testlib_1.0.2"],
+    "HEDVersion": ["score_2.0.0", "test:testconflict_1.1.2"],
     "License": "CC0",
     "Authors": [
         "Daniel G. Wakeman",

tests/data/bids_tests/eeg_ds003645s_hed_library/task-FacePerception_events.json

@@ -22,7 +22,7 @@
       "double_press": "Experiment participant presses both keys ."
     },
     "HED": {
-      "show_face": "Sensory-event, test:Experimental-stimulus, (Def/Face-image, Onset), (Def/Blink-inhibition-task,Onset),(Def/Cross-only, Offset)",
+      "show_face": "Sensory-event, test:Object-one, (Def/Face-image, Onset), (Def/Blink-inhibition-task,Onset),(Def/Cross-only, Offset)",
       "show_face_initial": "Sensory-event, Experimental-stimulus, (Def/Face-image, Onset), (Def/Blink-inhibition-task,Onset), (Def/Fixation-task, Onset)",
       "show_circle": "Sensory-event, (Intended-effect, Cue), (Def/Circle-only, Onset), (Def/Face-image, Offset), (Def/Blink-inhibition-task, Offset), (Def/Fixation-task, Offset)",
       "show_cross": "Sensory-event, (Intended-effect, Cue), (Def/Cross-only, Onset), (Def/Fixation-task, Onset),  (Def/Circle-only, Offset), Hyperventilation-refused-procedure/Could not comply",
@@ -68,12 +68,12 @@
   },
   "stim_file": {
     "Description": "Path of the stimulus file in the stimuli directory.",
-    "HED": "(Image, Pathname/#), test:Image"
+    "HED": "(Image, Pathname/#), test:Object-two"
   },
   "hed_def_sensory": {
     "Description": "Metadata dictionary for gathering sensory definitions",
     "HED": {
-      "cross_only_def": "(Definition/Cross-only, (Visual-presentation, (Foreground-view, (White, Cross), (Center-of, Computer-screen)), Sleep-architecture, (Background-view, Black), test:Cue, Description/A white fixation cross on a black background in the center of the screen.))",
+      "cross_only_def": "(Definition/Cross-only, (Visual-presentation, (Foreground-view, (White, Cross), (Center-of, Computer-screen)), Sleep-architecture, (Background-view, Black), test:Object-three, Description/A white fixation cross on a black background in the center of the screen.))",
       "face_image_def": "(Definition/Face-image, (Visual-presentation, (Foreground-view, ((Image, Face, Hair), Color/Grayscale), ((White, Cross), (Center-of, Computer-screen))), (Background-view, Black), Description/A happy or neutral face in frontal or three-quarters frontal pose with long hair cropped presented as an achromatic foreground image on a black background with a white fixation cross superposed.))",
       "circle_only_def": "(Definition/Circle-only, (Visual-presentation, (Foreground-view, ((White, Circle), (Center-of, Computer-screen))), (Background-view, Black), Description/A white circle on a black background in the center of the screen.))"
     }

…/data/schema_tests/HED_testlib_2.1.0.xml …ata/schema_tests/HED_testlocal_2.1.0.xmltests/data/schema_tests/HED_testlib_2.1.0.xml renamed to tests/data/schema_tests/HED_testlocal_2.1.0.xml tests/data/schema_tests/HED_testlib_2.1.0.xml renamed to tests/data/schema_tests/HED_testlocal_2.1.0.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
-<HED version="2.1.0" library="testlib" withStandard="8.4.0" unmerged="True">
-   <prologue>Conflicts: testlib_2.0.0 Violin-subsound1 and Violin-subsound2 and Violin-subsound3 have different parents. testlib_2.0.0 piano-subsound2 does not take value; testlib_2.2.0 Piano-subsound2 takes a value with a unit class.</prologue>
+<HED version="2.1.0" library="testlocal" withStandard="8.4.0" unmerged="True">
+   <prologue>Conflicts: testlocal_2.0.0 Violin-subsound1 and Violin-subsound2 and Violin-subsound3 have different parents. testlocal_2.0.0 piano-subsound2 does not take value; testlocal_2.2.0 Piano-subsound2 takes a value with a unit class.</prologue>
    <schema>
       <node>
          <name>BA-nonextension</name>

tests/data/schema_tests/merge_group_tests/HED_testconflict_2.0.0.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <HED version="2.0.0" library="testconflict" withStandard="8.5.0" unmerged="True">
-   <prologue>testconflict 2.0.0 partners with standard schema 8.5.0. Changes from 1.1.2: deletes Legacy-tag (major bump: tag deleted) and adds the Rooted-tag subtree rooted under the standard Event tag. Partnering an unpartnered library is itself a major change (testlib precedent).</prologue>
+   <prologue>testconflict 2.0.0 partners with standard schema 8.5.0. Changes from 1.1.2: deletes Legacy-tag (major bump: tag deleted) and adds the Rooted-tag subtree rooted under the standard Event tag. Partnering an unpartnered library is itself a major change (precedent of an earlier library).</prologue>
    <schema>
       <node>
          <name>Object-tag</name>