Skip to content

Commit b98d070

Browse files
authored
Merge pull request #774 from Remi-Gau/fix
[FIX] fix and tidy failing workflows
2 parents 6a49289 + 2b9db28 commit b98d070

File tree

8 files changed

+28
-24
lines changed

8 files changed

+28
-24
lines changed

.github/workflows/run_system_tests_matlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: system tests with matlab
1+
name: "matlab: system tests"
22

33
# Uses the cron schedule for github actions
44
#

.github/workflows/run_system_tests_octave.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "system tests with octave"
1+
name: "octave: system tests"
22

33
# Uses the cron schedule for github actions
44
#

.github/workflows/run_tests_matlab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: tests and coverage with matlab
1+
name: "matlab: tests"
22

33
on:
44

.github/workflows/run_tests_octave.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "tests with octave"
1+
name: "octave: tests"
22

33
on:
44

README.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
<!-- markdown-link-check-disable -->
2-
31
<!-- .. only:: html -->
42

3+
[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/cpp-lln-lab/bidspm/main.svg)](https://results.pre-commit.ci/latest/github/cpp-lln-lab/bidspm/main)
4+
[![miss hit](https://img.shields.io/badge/code%20style-miss_hit-000000.svg)](https://misshit.org/)
55
[![Documentation Status: main](https://readthedocs.org/projects/bidspm/badge/?version=stable)](https://bidspm.readthedocs.io/en/stable/?badge=stable)
66
[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/cpp-lln-lab/bidspm/dev)
7-
[![miss_hit](https://github.com/cpp-lln-lab/bidspm/actions/workflows/miss_hit.yml/badge.svg)](https://github.com/cpp-lln-lab/bidspm/actions/workflows/miss_hit.yml)
8-
[![tests with octave](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_tests_octave.yml/badge.svg)](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_tests_octave.yml)
97
[![tests with matlab](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_tests_matlab.yml/badge.svg)](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_tests_matlab.yml)
8+
[![tests with octave](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_tests_octave.yml/badge.svg)](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_tests_octave.yml)
109
[![system tests with matlab](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_system_tests_matlab.yml/badge.svg)](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_system_tests_matlab.yml)
11-
[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
12-
[![codecov](https://codecov.io/gh/cpp-lln-lab/bidspm/branch/master/graph/badge.svg?token=PMQYH0DIPX)](https://codecov.io/gh/cpp-lln-lab/bidspm)
10+
[![system tests with octave](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_system_tests_octave.yml/badge.svg)](https://github.com/cpp-lln-lab/bidspm/actions/workflows/run_system_tests_octave.yml)
11+
[![codecov](https://codecov.io/gh/cpp-lln-lab/bidspm/branch/main/graph/badge.svg?token=PMQYH0DIPX)](https://codecov.io/gh/cpp-lln-lab/bidspm)
1312
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3554331.svg)](https://doi.org/10.5281/zenodo.3554331)
1413
[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](https://github.com/cpp-lln-lab/bidspm#contributors)
1514

16-
<!-- markdown-link-check-enable -->
17-
1815
# bidspm
1916

2017
This is a Matlab / Octave toolbox to perform MRI data analysis on a
@@ -45,15 +42,15 @@ bidspm()
4542
```
4643

4744
Please see our
48-
[documentation](https://bidspm.readthedocs.io/en/stable/general_information.html)
45+
[documentation](https://bidspm.readthedocs.io/en/latest/general_information.html)
4946
for more info.
5047

5148
## Usage
5249

5350
For some of its functionality bidspm has a BIDS app like API.
5451

5552
See
56-
[this page for more information](https://bidspm.readthedocs.io/en/stable/bids_app_api.html).
53+
[this page for more information](https://bidspm.readthedocs.io/en/latest/usage_notes.html).
5754

5855
### Preprocessing
5956

@@ -87,7 +84,7 @@ bidspm(bids_dir, output_dir, 'subject', ...
8784
```
8885

8986
Please see our
90-
[documentation](https://bidspm.readthedocs.io/en/stable/bids_app_api.html) for
87+
[documentation](https://bidspm.readthedocs.io/en/latest/usage_notes.html) for
9188
more info.
9289

9390
## Features
@@ -138,7 +135,7 @@ used to perform:
138135
- GLM auto-correlation check
139136

140137
Please see our
141-
[documentation](https://bidspm.readthedocs.io/en/stable/index.html) for more
138+
[documentation](https://bidspm.readthedocs.io/en/latest/index.html) for more
142139
info.
143140

144141
## Citation

demos/MoAE/test_moae.m

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,18 @@
3434

3535
optionsFile = fullfile(WD, 'options', 'options_task-auditory.json');
3636

37-
space = {'IXI549Space'
37+
space = {'individual'
38+
'IXI549Space'
3839
'IXI549Space'
39-
'individual'
4040
'individual'};
41-
ignore = {{''}
41+
ignore = {{'unwarp'}
4242
{'unwarp', 'qa'}
43-
{'unwarp'}
4443
{''}
45-
};
44+
{''}};
4645

47-
models = {fullfile(WD, 'models', 'model-MoAE_smdl.json')
46+
models = {fullfile(WD, 'models', 'model-MoAEindividual_smdl.json')
47+
fullfile(WD, 'models', 'model-MoAE_smdl.json')
4848
fullfile(WD, 'models', 'model-MoAE_smdl.json')
49-
fullfile(WD, 'models', 'model-MoAEindividual_smdl.json')
5049
fullfile(WD, 'models', 'model-MoAEindividual_smdl.json')};
5150

5251
for iOption = 1:numel(space)

demos/face_repetition/test_face_rep.m

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030

3131
model_file = fullfile(WD, 'models', 'model-faceRepetition_smdl.json');
3232

33+
% skip unwarping with octave to avoid failure in CI
34+
% see https://github.com/cpp-lln-lab/bidspm/issues/769
35+
ignore = {''};
36+
if isOctave
37+
ignore = {'unwarp'};
38+
end
39+
3340
for iResolution = 2:3
3441

3542
opt.pipeline.name = ['bidspm-res' num2str(iResolution)];
@@ -46,6 +53,7 @@
4653
'action', 'preprocess', ...
4754
'task', {'facerepetition'}, ...
4855
'space', {'IXI549Space'}, ...
56+
'ignore', ignore, ...
4957
'options', opt);
5058

5159
%% stats

lib/bids-matlab

Submodule bids-matlab updated 232 files

0 commit comments

Comments
 (0)