Skip to content

Commit 5d4a2d2

Browse files
authored
Merge pull request #564 from Remi-Gau/api
[ENH] create a BIDS app API
2 parents ceeb870 + 81d592d commit 5d4a2d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+581
-156
lines changed

.github/workflows/miss_hit_quality.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ on:
99
branches: ['*']
1010

1111
jobs:
12+
1213
build:
1314

1415
runs-on: ubuntu-latest
1516

1617
steps:
1718

18-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
1920
with:
2021
submodules: true
2122
fetch-depth: 1

.github/workflows/miss_hit_style.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
name: miss_hit_style
22

33
on:
4+
45
push:
56
branches:
67
- main
78
- dev
9+
810
pull_request:
911
branches: ['*']
1012

@@ -15,12 +17,12 @@ jobs:
1517

1618
steps:
1719

18-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
1921
with:
2022
submodules: true
2123
fetch-depth: 1
2224

23-
- name: Set up Python 3.6
25+
- name: Set up Python
2426
uses: actions/setup-python@v2
2527
with:
2628
python-version: 3.6

.github/workflows/run_system_tests_matlab.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,18 @@ on:
2121
- dev
2222
pull_request:
2323
branches:
24-
- 'main'
24+
- main
2525
schedule:
2626
- cron: "0 0 1,15 * *"
2727

28-
# Allows you to run this workflow manually from the Actions tab
29-
workflow_dispatch:
28+
# Allows you to run this workflow manually from the Actions tab
29+
30+
workflow_dispatch:
3031

3132
jobs:
33+
3234
build:
35+
3336
runs-on: ubuntu-20.04
3437

3538
steps:
@@ -40,7 +43,7 @@ jobs:
4043
release: R2020a
4144

4245
- name: Clone cpp_spm
43-
uses: actions/checkout@v2
46+
uses: actions/checkout@v3
4447
with:
4548
submodules: true
4649
fetch-depth: 2

.github/workflows/run_system_tests_octave.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,27 @@ name: "system tests with octave: failure expected"
1212
# │ │ │ │ │
1313
# │ │ │ │ │
1414
# │ │ │ │ │
15-
# * * * * *
15+
# \* \* \* \* \*
1616

1717
on:
18+
1819
push:
1920
branches:
2021
- main
2122
- dev
23+
2224
pull_request:
2325
branches:
2426
- 'main'
27+
2528
schedule:
2629
- cron: "0 0 1,15 * *"
2730

2831
env:
2932
OCTFLAGS: --no-gui --no-window-system --silent
3033

3134
jobs:
35+
3236
build:
3337

3438
runs-on: ubuntu-latest
@@ -42,7 +46,7 @@ jobs:
4246
sudo apt-get -y install nodejs npm
4347
4448
- name: Clone cpp_spm
45-
uses: actions/checkout@v2
49+
uses: actions/checkout@v3
4650
with:
4751
submodules: true
4852
fetch-depth: 2

.github/workflows/run_tests_matlab.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
name: tests and coverage with matlab
22

33
on:
4+
45
push:
56
branches:
67
- main
78
- dev
9+
810
pull_request:
911
branches: ["*"]
1012

11-
# Allows you to run this workflow manually from the Actions tab
12-
workflow_dispatch:
13-
1413
jobs:
14+
1515
build:
16+
1617
runs-on: ubuntu-20.04
1718

1819
steps:
@@ -23,7 +24,7 @@ jobs:
2324
release: R2020a
2425

2526
- name: Clone cpp_spm
26-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
2728
with:
2829
submodules: true
2930
fetch-depth: 2

.github/workflows/run_tests_octave.yml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
name: "tests with octave: failure expected"
22

3-
# Uses the cron schedule for github actions
4-
#
5-
# https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows#scheduled-events
6-
#
7-
# ┌───────────── minute (0 - 59)
8-
# │ ┌───────────── hour (0 - 23)
9-
# │ │ ┌───────────── day of the month (1 - 31)
10-
# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC)
11-
# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT)
12-
# │ │ │ │ │
13-
# │ │ │ │ │
14-
# │ │ │ │ │
15-
# * * * * *
16-
173
on:
184
push:
195
branches:
@@ -22,9 +8,6 @@ on:
228
pull_request:
239
branches: ['*']
2410

25-
# Allows you to run this workflow manually from the Actions tab
26-
workflow_dispatch:
27-
2811
env:
2912
OCTFLAGS: --no-gui --no-window-system --silent
3013

@@ -41,7 +24,7 @@ jobs:
4124
sudo apt-get -y install octave liboctave-dev
4225
4326
- name: Clone cpp_spm
44-
uses: actions/checkout@v2
27+
uses: actions/checkout@v3
4528
with:
4629
submodules: true
4730
fetch-depth: 2
@@ -52,7 +35,7 @@ jobs:
5235
make -C spm12/src PLATFORM=octave distclean
5336
make -C spm12/src PLATFORM=octave
5437
make -C spm12/src PLATFORM=octave install
55-
octave $OCTFLAGS --eval "addpath(fullfile(pwd, 'spm12')); savepath();"
38+
octave $OCTFLAGS --eval "addpath(fullfile(pwd, 'spm12')); savepath(); exit;"
5639
5740
- name: Install Moxunit and MOcov
5841
run: |
@@ -63,12 +46,11 @@ jobs:
6346
6447
- name: Update octave path
6548
run: |
66-
octave $OCTFLAGS --eval "initCppSpm; savepath(); exit;"
67-
octave $OCTFLAGS --eval "addpath(fullfile(pwd, 'tests', 'utils')); savepath(); exit;"
49+
octave $OCTFLAGS --eval "initCppSpm(dev); savepath(); exit;"
6850
6951
- name: Prepare data
7052
run: |
71-
octave $OCTFLAGS --eval "initCppSpm; cd demos/MoAE; download_moae_ds(true); exit;"
53+
octave $OCTFLAGS --eval "cd demos/MoAE; download_moae_ds(true); exit;"
7254
cd tests
7355
make data
7456

.github/workflows/tests_matlab.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
run moxunit_set_path();
1111

1212
cd(root_dir);
13-
cpp_spm('dev');
13+
cpp_spm('action', 'dev');
1414

1515
cd demos/MoAE;
1616
download_moae_ds(true);

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ cpp_spm
2222
env
2323
venv
2424

25-
## visual studio code
26-
.vscode
27-
2825
## from running tests in root dir
2926
*/cfg/*
3027
*/group/*

.vscode/settings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"json.schemas": [
3+
{
4+
"fileMatch": ["model-*_smdl.json"],
5+
"url": "https://raw.githubusercontent.com/bids-standard/stats-models/gh-pages/BIDSStatsModel.json"
6+
}
7+
]
8+
}

Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
1313
git \
1414
octave \
1515
liboctave-dev \
16-
datalad &&
1716
apt-get clean
1817

1918
RUN rm -rf \
@@ -22,14 +21,14 @@ RUN rm -rf \
2221
/var/lib/apt/lists/* \
2322
/var/log/apt/term*
2423

25-
RUN mkdir /opt/spm12 &&
26-
curl -SL https://github.com/spm/spm12/archive/r7487.tar.gz |
27-
tar -xzC /opt/spm12 --strip-components 1 &&
28-
curl -SL https://raw.githubusercontent.com/spm/spm-docker/master/octave/spm12_r7487.patch |
29-
patch -p0 &&
30-
make -C /opt/spm12/src PLATFORM=octave distclean &&
31-
make -C /opt/spm12/src PLATFORM=octave &&
32-
make -C /opt/spm12/src PLATFORM=octave install &&
24+
RUN mkdir /opt/spm12 && \
25+
curl -SL https://github.com/spm/spm12/archive/r7487.tar.gz | \
26+
tar -xzC /opt/spm12 --strip-components 1 && \
27+
curl -SL https://raw.githubusercontent.com/spm/spm-docker/master/octave/spm12_r7487.patch | \
28+
patch -p0 && \
29+
make -C /opt/spm12/src PLATFORM=octave distclean && \
30+
make -C /opt/spm12/src PLATFORM=octave && \
31+
make -C /opt/spm12/src PLATFORM=octave install && \
3332
ln -s /opt/spm12/bin/spm12-octave /usr/local/bin/spm12
3433

3534
RUN octave --no-gui --eval "addpath(\"/opt/spm12\"); savepath ();"

0 commit comments

Comments
 (0)