Skip to content

Commit

Permalink
Merge pull request #542 from hed-standard/develop
Browse files Browse the repository at this point in the history 
Updated the readthedocs config as required
  • Loading branch information
@VisLab
VisLab authored Sep 7, 2023
2 parents d3ea9f1 + c47fff9 commit bb4a0cd
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 22 deletions.
4 changes: 2 additions & 2 deletions docs/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
'vcs_pageview_mode': '',
'style_nav_header_background': 'LightSlateGray',
# Toc options
'collapse_navigation': True,
'collapse_navigation': False,
'sticky_navigation': True,
'navigation_depth': 4,
'navigation_depth': 5,
'includehidden': True,
'titles_only': False
}
Expand Down
4 changes: 3 additions & 1 deletion readthedocs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ formats:
- pdf

build:
image: latest
os: "ubuntu-22.04"
tools:
python: "3.7"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
2 changes: 1 addition & 1 deletion tests/json_tests/DEF_EXPAND_INVALID.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
["onset", "duration", "event_code", "HED"],
[ 4.5, 0, "face", "Blue"],
[ 5.0, 0, "ball", "Green, Def/MyColor"],
[ 5.0, 0, "ball", "(Def-expand/MyColor, (Label/Pie))"]
[ 5.2, 0, "ball", "(Def-expand/MyColor, (Label/Pie))"]
]
}
]
Expand Down
4 changes: 2 additions & 2 deletions tests/json_tests/ONSET_OFFSET_INSET_ERROR.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
"events":
[
["onset", "duration", "event_code","HED"],
[ 4.5, 0, "face", "((Def-expand/MyColor, (Label/Pie)), (Green, (Yellow)), Onset)"],
[ 4.5, 0, "n/a", "((Def-expand/MyColor, (Label/Pie)), (Green, (Yellow)), Onset)"],
[ 5.0, 0, "ball", "Green, Def/MyColor"]
]
}
Expand Down Expand Up @@ -903,7 +903,7 @@
[
["onset", "duration", "event_code", "HED"],
[ 4.5, 0, "face", "Blue"],
[ 4.5, 0, "face", "Blue"],
[ 4.7, 0, "face", "Blue"],
[ 4.8, 0, "snack", "Blue"],
[ 5.0, 0, "ball", "Green, Def/MyColor"]
]
Expand Down
89 changes: 73 additions & 16 deletions tests/json_tests/SIDECAR_BRACES_INVALID.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,70 @@
["onset", "duration", "event_code","HED", "response_time"],
[ 4.5, 0, "face", "Blue", 0],
[ 5.0, 0, "ball", "Green, Def/MyColor", 1],
[ 5.0, 0, "face", "", 2],
[ 5.0, 0, "face", "n/a", 3]
[ 5.5, 0, "face", "", 2],
[ 5.7, 0, "face", "n/a", 3]
]
}
]
}
}
},
{
"error_code": "VALUE_INVALID",
"name": "sidecar-braces-invalid-spot",
"description": "A curly brace reference must only appear where a tag could.",
"schema": "8.1.0",
"definitions": ["(Definition/Acc/#, (Acceleration/#, Red))", "(Definition/MyColor, (Label/Pie))"],
"tests": {
"string_tests": {
"fails": [
],
"passes": [
]
},
"sidecar_tests": {
"fails": [
{
"event_code": {
"HED": {
"face": "(Red, Blue), (Green, (Yellow))",
"ball": "(Def/Acc/{response_time})"
}
},
"response_time": {
"Description": "Has description with HED",
"HED": "Label/#"
}
}
],
"passes": [
{
"event_code": {
"HED": {
"face": "(Red, Blue), (Green, (Yellow))",
"ball": "{response_time}, (Def/Acc/3.5 m-per-s^2)"
}
},
"response_time": {
"Description": "Has description with HED",
"HED": "Label/#"
}
}
]
},
"event_tests": {
"fails": [
],
"passes": [
]
},
"combo_tests": {
"fails": [
],
"passes": [
]
}
}
},
{
"error_code": "SIDECAR_BRACES_INVALID",
Expand Down Expand Up @@ -203,8 +260,8 @@
["onset", "duration", "response_time", "event_code","HED"],
[ 4.5, 0, 3.4, "face", "Blue"],
[ 5.0, 0, 6.8, "ball", "Green, Def/MyColor"],
[ 5.0, 0, "n/a", "face", ""],
[ 5.0, 0, "any", "face", "n/a"]
[ 5.2, 0, "n/a", "face", ""],
[ 5.5, 0, "any", "face", "n/a"]
]
}
]
Expand Down Expand Up @@ -295,8 +352,8 @@
["onset", "duration", "response_time", "event_code","HED"],
[ 4.5, 0, 3.4, "face", "Blue"],
[ 5.0, 0, 6.8, "ball", "Green, Def/MyColor"],
[ 5.0, 0, "n/a", "face", ""],
[ 5.0, 0, "any", "face", "n/a"]
[ 5.2, 0, "n/a", "face", ""],
[ 5.5, 0, "any", "face", "n/a"]
]
}
],
Expand All @@ -319,8 +376,8 @@
["onset", "duration", "response_time", "event_code","HED"],
[ 4.5, 0, 3.4, "face", "Blue"],
[ 5.0, 0, 6.8, "ball", "Green, Def/MyColor"],
[ 5.0, 0, "n/a", "face", ""],
[ 5.0, 0, "any", "face", "n/a"]
[ 5.2, 0, "n/a", "face", ""],
[ 5.5, 0, "any", "face", "n/a"]
]
}
]
Expand Down Expand Up @@ -431,8 +488,8 @@
["onset", "duration", "event_code","HED"],
[ 4.5, 0, "face", "Blue"],
[ 5.0, 0, "ball", "Green, Def/MyColor"],
[ 5.0, 0, "face", ""],
[ 5.0, 0, "face", "n/a"]
[ 5.2, 0, "face", ""],
[ 5.5, 0, "face", "n/a"]
]
}
],
Expand All @@ -455,8 +512,8 @@
["onset", "duration", "event_code","HED", "response_time"],
[ 4.5, 0, "face", "Blue", 1],
[ 5.0, 0, "ball", "Green, Def/MyColor", 1],
[ 5.0, 0, "face", "", 1],
[ 5.0, 0, "face", "n/a", 1]
[ 5.2, 0, "face", "", 1],
[ 5.5, 0, "face", "n/a", 1]
]
}
]
Expand Down Expand Up @@ -513,8 +570,8 @@
["onset", "duration", "event_code","HED"],
[ 4.5, 0, "face", "Blue, {response_time}"],
[ 5.0, 0, "ball", "Green, Def/MyColor"],
[ 5.0, 0, "face", ""],
[ 5.0, 0, "face", "n/a"]
[ 5.2, 0, "face", ""],
[ 5.5, 0, "face", "n/a"]
]
}
],
Expand All @@ -537,8 +594,8 @@
["onset", "duration", "event_code","HED", "response_time"],
[ 4.5, 0, "face", "Blue", 1],
[ 5.0, 0, "ball", "Green, Def/MyColor", 1],
[ 5.0, 0, "face", "", 1],
[ 5.0, 0, "face", "n/a", 1]
[ 5.2, 0, "face", "", 1],
[ 5.5, 0, "face", "n/a", 1]
]
}
]
Expand Down

0 comments on commit bb4a0cd

Please sign in to comment.