Skip to content

Commit 47a718c

Browse files
authored
Merge pull request #790 from Remi-Gau/mnt
[MNT] improve doc generation and remove dead code
2 parents 3a47942 + 13a0189 commit 47a718c

25 files changed

+192
-213
lines changed

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[codespell]
2-
skip = *.tsv,*.json,*.nii*,*.js,*.svg,*.eps,.git,env,*build,lib,outputs,inputs,bids-examples,stats_model,coverage_html
2+
skip = *.tsv,*.json,*.nii*,*.js,*.svg,*.eps,.git,env,*build,lib,outputs,inputs,bids-examples,stats_model,coverage_html,stats.md,preprocess.md
33
ignore-words-list = fo,te,als,ane,nin,fot,fwe,commun
44
builtin = clear,rare

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ body:
8080
8181
- type: dropdown
8282
attributes:
83-
label: BIDSpm version
83+
label: bidspm version
8484
description: |
8585
In the MATLAB / Octave command line, try one of the following:
8686
@@ -102,7 +102,7 @@ body:
102102

103103
- type: textarea
104104
attributes:
105-
label: BIDSpm branch / commit number
105+
label: bidspm branch / commit number
106106
description: |
107107
In a terminal:
108108

.github/workflows/codespell.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: codespell
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref }}

CITATION.cff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ title: "bidspm"
44

55
version: 2.2.0
66

7-
abstract: BIDSpm is a set pipelines and tools for Octave/MATLAB to process and analyze BIDS data sets using SPM.
7+
abstract: bidspm is a set of pipelines and tools for Octave / MATLAB to process and analyze BIDS data sets using SPM12.
88

99
message: "If you use this software, please cite it as below."
1010

1111
repository-code: "https://github.com/cpp-lln-lab/bidspm"
1212

1313
identifiers:
14-
- description: This is the collection of archived snapshots of all releases of BIDSpm
14+
- description: This is the collection of archived snapshots of all releases of bidspm
1515
type: doi
1616
value: "10.5281/zenodo.3554331"
1717

Dockerfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,30 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
2020
build-essential \
2121
curl \
2222
octave \
23-
liboctave-dev && \
24-
apt-get clean && \
23+
liboctave-dev &&
24+
apt-get clean &&
2525
rm -rf \
2626
/tmp/hsperfdata* \
2727
/var/*/apt/*/partial \
2828
/var/lib/apt/lists/* \
2929
/var/log/apt/term*
3030

31-
RUN mkdir /opt/spm12 && \
32-
curl -SL https://github.com/spm/spm12/archive/r7771.tar.gz | \
33-
tar -xzC /opt/spm12 --strip-components 1 && \
34-
curl -SL https://raw.githubusercontent.com/spm/spm-docker/main/octave/spm12_r7771.patch | \
35-
patch -p0 && \
36-
make -C /opt/spm12/src PLATFORM=octave distclean && \
37-
make -C /opt/spm12/src PLATFORM=octave && \
38-
make -C /opt/spm12/src PLATFORM=octave install && \
31+
RUN mkdir /opt/spm12 &&
32+
curl -SL https://github.com/spm/spm12/archive/r7771.tar.gz |
33+
tar -xzC /opt/spm12 --strip-components 1 &&
34+
curl -SL https://raw.githubusercontent.com/spm/spm-docker/main/octave/spm12_r7771.patch |
35+
patch -p0 &&
36+
make -C /opt/spm12/src PLATFORM=octave distclean &&
37+
make -C /opt/spm12/src PLATFORM=octave &&
38+
make -C /opt/spm12/src PLATFORM=octave install &&
3939
ln -s /opt/spm12/bin/spm12-octave /usr/local/bin/spm12
4040

4141
RUN octave --no-gui --eval "addpath('/opt/spm12/'); savepath ();"
4242

4343
## Install nods and bids validator
4444
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
45-
nodejs npm && \
46-
apt-get clean && \
45+
nodejs npm &&
46+
apt-get clean &&
4747
rm -rf \
4848
/tmp/hsperfdata* \
4949
/var/*/apt/*/partial \
@@ -52,7 +52,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
5252

5353
RUN node -v && npm -v && npm install -g bids-validator
5454

55-
## Install BIDSpm in user folder
55+
## Install bidspm in user folder
5656
RUN test "$(getent passwd neuro)" || useradd --no-user-group --create-home --shell /bin/bash neuro
5757

5858
USER neuro

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ used to perform:
136136
- GLM auto-correlation check
137137

138138
Please see our
139-
[documentation](https://bidspm.readthedocs.io/en/latest/index.html) for more
140-
info.
139+
[documentation](https://bidspm.readthedocs.io/en/latest/index.html) for more info.
141140

142141
## Citation
143142

bidspm.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,13 +417,13 @@ function initBidspm(dev)
417417
pathSep = ';';
418418
end
419419

420-
% add library first and then BIDSpm source code
420+
% add library first and then bidspm source code
421421
% except for current folder
422422
run(fullfile(thisDirectory, 'lib', 'CPP_ROI', 'initCppRoi'));
423423
run(fullfile(thisDirectory, 'lib', 'spm_2_bids', 'init_spm_2_bids'));
424424
run(fullfile(thisDirectory, 'lib', 'octache', 'setup'));
425425

426-
% now add BIDSpm source code
426+
% now add bidspm source code
427427
BIDSPM_PATHS = fullfile(thisDirectory);
428428
BIDSPM_PATHS = cat(2, BIDSPM_PATHS, ...
429429
pathSep, ...

demos/vismotion/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Small demo using visual motion localizer data to show how to set up an analysis
2-
with BIDSpm from scratch with datalad.
2+
with bidspm from scratch with datalad.
33

4-
# Using BIDSpm and datalad
4+
# Using bidspm and datalad
55

66
Ideally better to use the datalad fMRI template we have set up, this shows a set
77
by step approach.
@@ -26,7 +26,7 @@ datalad create -c yoda visual_motion_localiser
2626
cd visual_motion_localiser
2727
```
2828

29-
Add the BIDSpm code as a sub-dataset, checkout the dev branch ands initializes
29+
Add the bidspm code as a sub-dataset, checkout the dev branch ands initializes
3030

3131
all submodules.
3232

@@ -47,7 +47,7 @@ cd code/bidspm
4747
git checkout dev
4848
git submodule update --init --recursive && git submodule update --recursive
4949
cd ..
50-
datalad save -m 'update BIDSpm submodules'
50+
datalad save -m 'update bidspm submodules'
5151
```
5252

5353
Now let's get the raw data as a subdataset and put it in an `inputs/raw` folder.

demos/vismotion/vismotion_demo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ root_directory="${PWD}/../.."
1818
datalad create -c yoda ~/visual_motion_localiser
1919
cd ~/visual_motion_localiser
2020

21-
# get BIDSpm code from the dev branch
21+
# get bidspm code from the dev branch
2222
source="https://github.com/cpp-lln-lab/bidspm.git"
2323

2424
# for debugging uncomment the following line

docs/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# documentation
22
build/*
3+
reports

0 commit comments

Comments
 (0)