Skip to content

Commit a6584f2

Browse files
authored
Merge branch 'Inria-Empenn:main' into O21U_repro_2
2 parents a91a759 + f8742ca commit a6584f2

38 files changed

+305
-89
lines changed

.github/workflows/code_quality.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ jobs:
2525
# Steps that define the job
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Set up Python
31-
uses: actions/setup-python@v3
31+
uses: actions/setup-python@v4
3232
with:
3333
python-version: 3.9
3434

35-
- uses: actions/cache@v3
35+
- uses: actions/cache@v4
3636
with:
3737
path: ~/.cache/pip
3838
key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }}
@@ -50,7 +50,7 @@ jobs:
5050
pylint --fail-under 8 tests > pylint_report_tests.txt
5151
5252
- name: Archive pylint results
53-
uses: actions/upload-artifact@v3
53+
uses: actions/upload-artifact@v4
5454
if: failure() # Only if previous step failed
5555
with:
5656
name: pylint-reports-python

.github/workflows/codespell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717

1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121
- name: Codespell
2222
uses: codespell-project/actions-codespell@v2

.github/workflows/pipeline_status.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout main branch
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
with:
2727
ref: main
2828

2929
- name: Checkout wiki
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
repository: ${{github.repository}}.wiki
3333
path: wiki
3434

3535
- name: Set up Python 3.9
36-
uses: actions/setup-python@v3
36+
uses: actions/setup-python@v4
3737
with:
3838
python-version: 3.9
3939

40-
- uses: actions/cache@v3
40+
- uses: actions/cache@v4
4141
with:
4242
path: ~/.cache/pip
4343
key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }}

.github/workflows/pipeline_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
tests: ${{ steps.identify.outputs.tests }}
2121
steps:
2222
- name: Checkout current branch
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
2626

@@ -54,7 +54,7 @@ jobs:
5454
timeout-minutes: 2880 # 48h
5555
steps:
5656
- name: Checkout PR branch
57-
uses: actions/checkout@v3
57+
uses: actions/checkout@v4
5858

5959
- name: Load configuration for self-hosted runner
6060
run: cp /home/neuro/local_testing_config.toml narps_open/utils/configuration/testing_config.toml
@@ -75,7 +75,7 @@ jobs:
7575
7676
- name: Archive pipeline execution failures
7777
if: ${{ failure() }} # Run only if previous job fails
78-
uses: actions/upload-artifact@v3
78+
uses: actions/upload-artifact@v4
7979
with:
8080
name: pipeline_tests-reports
8181
path: |

.github/workflows/test_changes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
tests: ${{ steps.identify.outputs.tests }}
2020
steps:
2121
- name: Checkout main branch for comparison
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525

@@ -45,7 +45,7 @@ jobs:
4545
timeout-minutes: 2880 # 48h
4646
steps:
4747
- name: Checkout PR branch
48-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4949

5050
- name: Load configuration for self-hosted runner
5151
run: cp /home/neuro/local_testing_config.toml narps_open/utils/configuration/testing_config.toml

.github/workflows/unit_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
# Steps that define the job
3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434

3535
- name: Load configuration for self-hosted runner
3636
run: cp /home/neuro/local_testing_config.toml narps_open/utils/configuration/testing_config.toml
@@ -48,7 +48,7 @@ jobs:
4848
4949
- name: Archive pytest results
5050
if: ${{ failure() }} # Run only if previous job fails
51-
uses: actions/upload-artifact@v3
51+
uses: actions/upload-artifact@v4
5252
with:
5353
name: unit_tests-reports
5454
path: |

docs/core.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,17 @@ This module contains a set of functions dedicated to computations on images.
124124
# Get dimensions of voxels along x, y, and z in mm (returns e.g.: [1.0, 1.0, 1.0]).
125125
get_voxel_dimensions('/path/to/the/image.nii.gz')
126126
```
127+
128+
* `get_image_timepoint` : extracts the 3D volume in a given time point range from a 4D Nifti image
129+
130+
```python
131+
# Create a nifti 3D file containing time point 5 of the input image (returns a path to the generated 3D image)
132+
get_image_timepoints('/path/to/the/image.nii.gz', 5, 5):
133+
134+
# Create a nifti 3D file containing time points 5 to 10 of the input image (returns a path to the generated 3D image)
135+
get_image_timepoints('/path/to/the/image.nii.gz', 5, 10):
136+
```
137+
127138
## narps_open.core.interfaces
128139

129140
This module contains a set of interface creators inheriting form the `narps_open.core.interfaces.InterfaceCreator` abstract class.

docs/data.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ narps_results -h
8888
a list of team IDs
8989
-a, --all download results from all teams
9090
-r, --rectify rectify the results
91+
--config CONFIG custom configuration file to be used
9192

9293
# Either download all collections
9394
narps_results -a

docs/description.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ narps_description -h
2828
# the sub dictionary of team description
2929
# --json output team description as JSON
3030
# --md output team description as Markdown
31+
# --config CONFIG custom configuration file to be used
3132

3233
narps_description -t 2T6S --json
3334
# {

docs/running.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ narps_open_runner -h
3030
the analysis levels to run (p=preprocessing, r=run, s=subject, g=group)
3131
-c, --check check pipeline outputs (runner is not launched)
3232
-e, --exclusions run the analyses without the excluded subjects
33+
--config CONFIG custom configuration file to be used
3334

3435
narps_open_runner -t 2T6S -s 001 006 020 100 # Launches the full pipeline on the given subjects
3536
narps_open_runner -t 2T6S -r 4 # Launches the full pipeline on 4 random subjects

0 commit comments

Comments
 (0)