Merge pull request #831 from VisLab/develop

Updated test schema versions -- some still need fixing.

hed/models/spreadsheet_input.py

@@ -12,20 +12,21 @@ def __init__(self, file=None, file_type=None, worksheet_name=None, tag_columns=N
 
         Parameters:
             file (str or file like): An xlsx/tsv file to open or a File object.
-            file_type (str or None): ".xlsx" for excel, ".tsv" or ".txt" for tsv. data. If file is a string, the
+            file_type (str or None): ".xlsx" for Excel, ".tsv" or ".txt" for tsv. data. 
             worksheet_name (str or None): The name of the Excel workbook worksheet that contains the HED tags.
                 Not applicable to tsv files. If omitted for Excel, the first worksheet is assumed.
             tag_columns (list): A list of ints containing the columns that contain the HED tags.
                 The default value is [1] indicating only the second column has tags.
-            has_column_names (bool): True if file has column names. Validation will skip over the
+            has_column_names (bool): True if file has column names. Validation will skip over the first row.
                 first line of the file if the spreadsheet as column names.
-            column_prefix_dictionary (dict): Dictionary with keys that are column numbers/names and values are HED tag
+            column_prefix_dictionary (dict or None): Dictionary with keys that are column numbers/names and values are HED tag
                 prefixes to prepend to the tags in that column before processing.
 
         Notes:
+            - If file is a string, file_type is derived from file and this parameter is ignored.  
             - column_prefix_dictionary may be deprecated/renamed.  These are no longer prefixes,
               but rather converted to value columns.
-              eg. {"key": "Description", 1: "Label/"} will turn into value columns as
+              e.g. {"key": "Description", 1: "Label/"} will turn into value columns as
               {"key": "Description/#", 1: "Label/#"}
               It will be a validation issue if column 1 is called "key" in the above example.
               This means it no longer accepts anything but the value portion only in the columns.

requirements.txt

@@ -6,5 +6,5 @@ pandas>=1.3.5
 portalocker>=2.7.0
 semantic_version>=2.10.0
 wordcloud==1.9.3
-jsonschema==4.18.4
+jsonschema>=4.17.3
 rdflib>=6

setup.cfg

@@ -25,6 +25,7 @@ install_requires =
     et-xmlfile
     inflect
     jdcal
+    jsonschema
     numpy
     openpyxl
     pandas

tests/data/bids_tests/eeg_ds003645s_hed/dataset_description.json

@@ -1,7 +1,7 @@
 {
     "Name": "Face processing MEEG dataset with HED annotation",
-    "BIDSVersion": "1.8.4",
-    "HEDVersion": "8.0.0",
+    "BIDSVersion": "1.9.0",
+    "HEDVersion": "8.2.0",
     "License": "CC0",
     "Authors": [
         "Daniel G. Wakeman",

tests/data/bids_tests/eeg_ds003645s_hed_inheritance/dataset_description.json

@@ -1,7 +1,7 @@
 {
     "Name": "Face processing MEEG dataset with HED annotation",
-    "BIDSVersion": "1.8.4",
-    "HEDVersion": "8.0.0",
+    "BIDSVersion": "1.9.0",
+    "HEDVersion": "8.2.0",
     "License": "CC0",
     "Authors": [
         "Daniel G. Wakeman",

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.8.4",
-    "HEDVersion": ["8.0.0", "sc:score_1.0.0",  "test:testlib_1.0.2"],
+    "BIDSVersion": "1.9.0",
+    "HEDVersion": ["8.2.0", "sc:score_1.0.0",  "test:testlib_1.0.2"],
     "License": "CC0",
     "Authors": [
         "Daniel G. Wakeman",