Skip to content
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.

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

Updated test schema versions #831

Merged
merged 1 commit into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions hed/models/spreadsheet_input.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ install_requires =
et-xmlfile
inflect
jdcal
jsonschema
numpy
openpyxl
pandas
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

Large diffs are not rendered by default.

Loading