Skip to content

Commit a06a0bc

Browse files
authored
Merge pull request #221 from cpp-lln-lab/dev
[REL] 2.2.0
2 parents 6ad770f + db9f238 commit a06a0bc

File tree

110 files changed

+2385
-2671
lines changed

Some content is hidden

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

110 files changed

+2385
-2671
lines changed

.all-contributorsrc

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"contributors": [
88
{
99
"login": "CerenB",
10-
"name": "CerenB",
10+
"name": "Ceren Battal",
1111
"avatar_url": "https://avatars1.githubusercontent.com/u/10451654?v=4",
1212
"profile": "https://github.com/CerenB",
1313
"contributions": [
@@ -21,7 +21,7 @@
2121
},
2222
{
2323
"login": "marcobarilari",
24-
"name": "marcobarilari",
24+
"name": "Marco Barilari",
2525
"avatar_url": "https://avatars3.githubusercontent.com/u/38101692?v=4",
2626
"profile": "https://github.com/marcobarilari",
2727
"contributions": [
@@ -64,7 +64,7 @@
6464
},
6565
{
6666
"login": "iqrashahzad14",
67-
"name": "iqrashahzad14",
67+
"name": "Iqra Shahzad",
6868
"avatar_url": "https://avatars.githubusercontent.com/u/75671348?v=4",
6969
"profile": "https://github.com/iqrashahzad14",
7070
"contributions": [

.github/dependabot.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Documentation
32
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
43
version: 2

.github/release-drafter.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
template: |
2+
## Release Notes
3+
4+
## CHANGES
5+
$CHANGES

.github/workflows/bids_validator.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,26 @@ name: BIDS validator
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: ['master', 'main', 'dev']
76
pull_request:
8-
branches: ['master']
7+
branches: ['*']
98

109
env:
1110
OCTFLAGS: --no-gui --no-window-system --silent
1211

1312
jobs:
1413
build:
15-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1615
steps:
1716

17+
- uses: actions/setup-node@v3
18+
with:
19+
node-version: '14'
20+
1821
- uses: actions/checkout@v3
1922
with:
2023
submodules: true
21-
fetch-depth: 1
24+
fetch-depth: 0
2225

2326
- name: Make jsonread for octave
2427
run: |
@@ -37,9 +40,10 @@ jobs:
3740
3841
- name: Install BIDS validator
3942
run: |
40-
sudo npm install -g bids-validator@1.6.2
43+
sudo npm install -g bids-validator
4144
4245
- name: Create dummy dataset and validate it
4346
run: |
4447
cd tests/manualTests
45-
octave $OCTFLAGS --eval "test_makeRawDataset" && bids-validator `pwd`/output/raw/ --ignoreNiftiHeaders
48+
octave $OCTFLAGS --eval "test_makeRawDataset"
49+
bids-validator `pwd`/output/raw/ --ignoreNiftiHeaders

.github/workflows/check_md_links.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
push:
77
branches:
88
- master
9+
- dev
910
pull_request:
1011
branches: ['*']
1112

.github/workflows/miss_hit.yml

-41
This file was deleted.

.github/workflows/run_tests.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414
steps:
1515

1616
- uses: actions/checkout@v3
@@ -27,11 +27,11 @@ jobs:
2727
mkoctfile --mex jsonread.c jsmn.c -DJSMN_PARENT_LINKS
2828
2929
- name: MOxUnit Action
30-
uses: joergbrech/moxunit-action@master
30+
uses: joergbrech/moxunit-action@v1.2.0
3131
with:
3232
tests: tests # files or directories containing the MOxUnit test cases
3333
src: src # directories to be added to the Octave search path before running the tests.
34-
ext: tests/utils # External resources to add to the search put (excluded from coverage)
34+
ext: tests/utils lib # External resources to add to the search put (excluded from coverage)
3535
# data: # Directory for test data
3636
with_coverage: true
3737
cover_xml_file: coverage.xml

.github/workflows/update_submodules.yml

-100
This file was deleted.

.gitignore

+45-10
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,77 @@
11
# exclude mac file
22
*DS_Store
33

4-
# exclude matlab autosaves and octave workspace info
5-
*.m~
6-
*octave-workspace
7-
84
# exclude content of logfiles folders
9-
*output*
5+
output
6+
107
*.mat
118

129
# exclude temp files from tests and coverage
1310
*test_code_report.txt
11+
test_report.log
1412
*coverage*
13+
check_my_code_report.txt
1514

1615
*filteredBy*
1716

1817
tests/*.nii*
1918
tests/*.json*
2019
tests/*.tsv*
2120

22-
# exclude report from check_my_code
23-
check_my_code_report.txt
21+
*_cfg.json
2422

2523
# jupyter notebook checkpoints
26-
notebooks/.ipynb_checkpoints/*
24+
.ipynb_checkpoints
2725
notebooks/source/*
28-
notebooks/output/*
2926
notebooks/new_experiment/*
3027

3128
# ignore node js files
32-
node_modules/*
29+
node_modules
30+
package.json
3331
package-lock.json
3432

3533
# visual studio code stuff
3634
.vscode
3735

3836
# virtual env
3937
cpp_bids/*
38+
env
4039

4140
# documentation
4241
docs/build/*
42+
43+
## MATLAB / OCTAVE gitignore template
44+
45+
# From : https://github.com/github/gitignore/blob/master/Global/MATLAB.gitignore
46+
47+
# Windows default autosave extension
48+
*.asv
49+
50+
# OSX / *nix default autosave extension
51+
*.m~
52+
53+
# Compiled MEX binaries (all platforms)
54+
*.mex*
55+
56+
# Packaged app and toolbox files
57+
*.mlappinstall
58+
*.mltbx
59+
60+
# Generated helpsearch folders
61+
helpsearch*/
62+
63+
# Simulink code generation folders
64+
slprj/
65+
sccprj/
66+
67+
# Matlab code generation folders
68+
codegen/
69+
70+
# Simulink autosave extension
71+
*.autosave
72+
73+
# Simulink cache files
74+
*.slxc
75+
76+
# Octave session info
77+
octave-workspace

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[submodule "lib/bids-matlab"]
22
path = lib/bids-matlab
33
url = https://github.com/bids-standard/bids-matlab.git
4-
branch = master
4+
branch = dev
55
[submodule "lib/JSONio"]
66
path = lib/JSONio
77
url = https://github.com/gllmflndn/JSONio.git

0 commit comments

Comments
 (0)