Skip to content

Commit 9149be5

Browse files
authored
Merge pull request #39 from cpp-lln-lab/dev
[REL] 0.2.1
2 parents b2cd9c2 + 1c8b3ba commit 9149be5

28 files changed

+441
-264
lines changed

.github/release-drafter.yml

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

.github/workflows/miss_hit_code_quality.yml

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

.github/workflows/miss_hit_code_style.yml

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

.github/workflows/run_tests_matlab.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
build:
1616

17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-22.04
1818

1919
steps:
2020

@@ -54,4 +54,4 @@ jobs:
5454
file: coverage.xml # optional
5555
flags: unittests # optional
5656
name: codecov-umbrella # optional
57-
fail_ci_if_error: true # optional (default = false)
57+
fail_ci_if_error: false # optional (default = false)

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ lib/JSONio
1313
coverage_html
1414
coverage.xml
1515
test_report.log
16+
mapping.md
1617

1718
## MATLAB / OCTAVE gitignore template
1819

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cff-version: 1.2.0
22

33
title: "spm_2_bids"
44

5-
version: 0.2.0dev
5+
version: 0.2.1
66

77
abstract: Toolbox to convert SPM output files to valid BIDS derivatives.
88

docs/source/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
author = "Rémi Gau"
2323

2424
# The full version, including alpha/beta/rc tags
25-
release = "v0.2.0dev"
25+
with open('../../version.txt', encoding='utf-8') as version_file:
26+
release = version_file.read()
2627

2728

2829
# -- General configuration ---------------------------------------------------

init_spm_2_bids.m

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function init_spm_2_bids
1+
function init_spm_2_bids(add_dev)
22
%
33
% 1 - Check if version requirements
44
% are satisfied and the packages are
@@ -15,6 +15,10 @@
1515
%
1616
% (C) Copyright 2021 spm_2_bids developers
1717

18+
if nargin < 1
19+
add_dev = false;
20+
end
21+
1822
OCTAVE_VER = '4.0.3';
1923
MATLAB_VER = '8.6.0';
2024

@@ -53,7 +57,10 @@
5357

5458
end
5559

56-
add_dependencies();
60+
add_dependencies(add_dev);
61+
62+
pth = fileparts(mfilename('fullpath'));
63+
addpath(genpath(fullfile(pth, 'src')));
5764

5865
disp('Correct matlab/octave versions and added to the path!');
5966

@@ -90,11 +97,12 @@ function try_install_from_forge(package_name)
9097

9198
end
9299

93-
function add_dependencies()
100+
function add_dependencies(add_dev)
94101

95-
pth = fileparts(mfilename('fullpath'));
96-
addpath(fullfile(pth, 'lib', 'bids-matlab'));
97-
addpath(fullfile(pth, 'tests', 'utils'));
98-
addpath(genpath(fullfile(pth, 'src')));
102+
if add_dev
103+
pth = fileparts(mfilename('fullpath'));
104+
addpath(fullfile(pth, 'lib', 'bids-matlab'));
105+
addpath(fullfile(pth, 'lib', 'JSONio'));
106+
end
99107

100108
end

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
miss_hit==0.9.33
1+
miss_hit==0.9.35
22
pre-commit
33
jupyterlab
44
octave_kernel

run_tests.m

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@
55
if isdir(fullfile(thisDir, 'lib', 'bids-matlab'))
66
addpath(fullfile(thisDir, 'lib', 'bids-matlab'));
77
end
8+
if isdir(fullfile(thisDir, 'lib', 'JSONio'))
9+
addpath(fullfile(thisDir, 'lib', 'JSONio'));
10+
end
811

912
folderToCover = fullfile(thisDir, 'src');
1013
testFolder = fullfile(thisDir, 'tests');
1114

15+
addpath(fullfile(testFolder, 'utils'));
16+
1217
success = moxunit_runtests(testFolder, ...
1318
'-verbose', '-recursive', '-with_coverage', ...
1419
'-cover', folderToCover, ...

0 commit comments

Comments
 (0)