Skip to content

Commit b6de523

Browse files
authored
Merge pull request #112 from Remi-Gau/remi-update_bids_validation
update bids validator version in CI
2 parents 518a615 + e7c9045 commit b6de523

20 files changed

+4053
-119
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

.github/workflows/moxunit.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,29 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14+
1415
- uses: actions/checkout@v2
1516
with:
1617
submodules: true
1718
fetch-depth: 1
19+
20+
- name: Make jsonread for octave
21+
run: |
22+
sudo apt-get -y -qq update
23+
sudo apt-get -y install octave
24+
sudo apt-get -y install liboctave-dev
25+
cd lib/JSONio
26+
mkoctfile --mex jsonread.c jsmn.c -DJSMN_PARENT_LINKS
27+
# cd ../..
28+
1829
- name: MOxUnit Action
1930
uses: joergbrech/[email protected]
2031
with:
2132
tests: tests
2233
src: src
2334
with_coverage: true
2435
cover_xml_file: coverage.xml
36+
2537
- name: Code coverage
2638
uses: codecov/codecov-action@v1
2739
with:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,3 @@ node_modules/*
3131
package-lock.json
3232

3333

34-

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ before_install:
3333
- travis_retry sudo apt-get -y install nodejs
3434
- travis_retry sudo apt-get -y install npm
3535
# Install BIDS-Validator
36-
- sudo npm install -g [email protected].4
36+
- sudo npm install -g [email protected].6
3737

3838
install:
3939
# make octave file the JSONio submodule

README.md

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,23 +101,31 @@ Here are the naming templates used.
101101

102102
- Behavior
103103

104-
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.tsv`
105-
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.json`
106-
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.tsv`
107-
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.json`
104+
```
105+
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.tsv
106+
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.json
107+
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.tsv
108+
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.json
109+
```
108110

109111
- BOLD
110112

111-
`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_ce-<label>][_dir-<label>][_rec-<label>][_run-<index>][_echo-<index>]_<contrast_label>.nii[.gz]`
113+
```
114+
sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_ce-<label>][_dir-<label>][_rec-<label>][_run-<index>][_echo-<index>]_<contrast_label>.nii[.gz]
115+
```
112116

113117
- iEEG
114118

115-
`sub-<label>[_ses-<label>]_task-<task_label>[_run-<index>]_ieeg.json`
119+
```
120+
sub-<label>[_ses-<label>]_task-<task_label>[_run-<index>]_ieeg.json
121+
```
116122

117123
- EEG
118124

119-
`sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.<manufacturer_specific_extension>`
120-
`sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.json`
125+
```
126+
sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.<manufacturer_specific_extension>
127+
sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.json
128+
```
121129

122130
<!-- European data format (Each recording consisting of a .edf file)
123131
@@ -136,14 +144,19 @@ Biosemi data format (Each recording consisting of a .bdf file) -->
136144
current format `<matches>_recording-eyetracking_physio.tsv.gz`
137145

138146
future BEP format in a dedicated eyetracker folder
139-
`sub-<participant_label>[_ses-<label>][_acq-<label>]_task-<task_label>_eyetrack.<manufacturer_specific_extension>`
147+
148+
```
149+
sub-<participant_label>[_ses-<label>][_acq-<label>]_task-<task_label>_eyetrack.<manufacturer_specific_extension>
150+
```
140151

141152
- Stim and physio
142153

143-
`<matches>[_recording-<label>]_physio.tsv.gz`
144-
`<matches>[_recording-<label>]_physio.json`
145-
`<matches>[_recording-<label>]_stim.tsv.gz`
146-
`<matches>[_recording-<label>]_stim.json`
154+
```
155+
<matches>[_recording-<label>]_physio.tsv.gz
156+
<matches>[_recording-<label>]_physio.json
157+
<matches>[_recording-<label>]_stim.tsv.gz
158+
<matches>[_recording-<label>]_stim.json
159+
```
147160

148161
### Change log
149162

manualTests/test_createDataDictionary.m

Lines changed: 0 additions & 55 deletions
This file was deleted.

manualTests/test_makeRawDataset.m

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,14 @@ function test_makeRawDataset()
7171
saveEventsFile('close', cfg, logFile);
7272

7373
% add dummy stim data
74-
stimLogFile = saveEventsFile('open_stim', cfg, logFile);
74+
stimLogFile.extraColumns.Speed.length = 1;
75+
stimLogFile.extraColumns.LHL24.length = 3;
76+
stimLogFile.extraColumns.is_Fixation.length = 1;
77+
78+
stimLogFile.SamplingFrequency = cfg.mri.repetitionTime;
79+
stimLogFile.StartTime = 0;
80+
81+
stimLogFile = saveEventsFile('open_stim', cfg, stimLogFile);
7582
for i = 1:100
7683
stimLogFile(i, 1).onset = cfg.mri.repetitionTime * i;
7784
stimLogFile(i, 1).trial_type = 'test';

0 commit comments

Comments
 (0)