Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

C88N refactoring #116

Merged
merged 39 commits into from
Jan 4, 2024
Merged
Changes from 9 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
40abccc
[REFAC] make C88N conform with the Pipeline class + PEP8 clean
bclenet Mar 27, 2023
eabf700
[BUG] typo in dir names
bclenet Apr 7, 2023
d019195
[TEST] making paths consistent in pipeline test execution [skip ci]
bclenet Apr 7, 2023
9903f35
Using the right contrast ids
bclenet Apr 12, 2023
8db2006
Using the right contrast ids
bclenet Apr 12, 2023
7c6e160
[BUG] in ci script for pipeline changes
bclenet Mar 27, 2023
af995cb
[BUG] correctly forming results download link
bclenet Apr 7, 2023
6a74494
Allowing to tweak the number of processes the runner uses
bclenet Apr 12, 2023
da8a9fa
[ENH] Allowing to run group and subject level independantly
bclenet Apr 12, 2023
45a64c2
[TEST] test the runner launching first level or second level only
bclenet Apr 17, 2023
b705960
[DOC] runner : allow to run levels separately
bclenet Apr 18, 2023
6986e90
[BUG] inside unit_tests workflow
bclenet Aug 31, 2023
d6e67f3
Merge branch 'Inria-Empenn:main' into main
bclenet Aug 31, 2023
c3bfc53
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 4, 2023
4b30504
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 19, 2023
fd15ffc
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 21, 2023
6ebe5d2
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 29, 2023
0a584dd
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 29, 2023
e284b80
Merge branch 'Inria-Empenn:main' into main
bclenet Sep 29, 2023
1a34af5
Merge branch 'main' into c88n_refac
bclenet Sep 29, 2023
25f881c
Pipeline refac after merge
bclenet Sep 29, 2023
64127b9
Refac pipeline
bclenet Oct 2, 2023
9b9b646
[TEST] rewrite test file + bugs in pipeline file
bclenet Oct 3, 2023
e513308
Codespell
bclenet Oct 3, 2023
5774813
Merge branch 'Inria-Empenn:main' into main
bclenet Oct 5, 2023
8f12d3d
Merge branch 'Inria-Empenn:main' into main
bclenet Oct 5, 2023
91dc744
Merge branch 'Inria-Empenn:main' into main
bclenet Oct 10, 2023
c03e9d1
Merge branch 'Inria-Empenn:main' into main
bclenet Nov 20, 2023
fe0d25b
Merge branch 'Inria-Empenn:main' into main
bclenet Nov 22, 2023
04d5ff2
Merge branch 'Inria-Empenn:main' into main
bclenet Nov 22, 2023
f557d8e
Merge branch 'main' into c88n_refac [skip ci]
bclenet Jan 2, 2024
8aed13e
[REFAC] C88N [skip ci]
bclenet Jan 2, 2024
bc08911
[REFAC] using narps_open.core for contrast files selection [TEST] upd…
bclenet Jan 3, 2024
9645b7b
Issue with base directory [skip ci]
bclenet Jan 3, 2024
b607dc1
Back to the right order of contrasts [skip ci]
bclenet Jan 3, 2024
a79126c
[REFAC] naming [skip ci]
bclenet Jan 3, 2024
ac87fd9
Issue with groupComp [skip ci]
bclenet Jan 4, 2024
6bf8336
[BUG] subject ids in search patterns [skip ci]
bclenet Jan 4, 2024
4ec7dfe
Remove unwanted graphs[skip ci]
bclenet Jan 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .codespellrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[codespell]
skip = .git,*.pdf,*.svg,analysis_pipelines_full_descriptions.tsv
# softwares - key in data structures etc
ignore-words-list = te,fpr,fwe,softwares
32 changes: 0 additions & 32 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

65 changes: 65 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Bug report
description: Create a report to help improving the project.
title: "[BUG] "
labels: ["\U0001F6E0 goal: fix, \U0001F6A6 status: awaiting triage"]
body:
- type: markdown
attributes:
value: |
Thanks for suggesting this feature! :raised_hands:
- type: textarea
id: description
attributes:
label: Describe the bug
description: A clear and concise description of what the bug is.
placeholder: ex. I cannot access the pipeline_template.py file.
validations:
required: true
- type: textarea
id: reproduction
attributes:
label: Reproduction
description: Describe the steps to reproduce the bug.
placeholder: |
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
placeholder: This should work like this '...'
validations:
required: true
- type: input
id: narps_open_pipelines_verion
attributes:
label: NARPS Open Pipeline version
placeholder: ex. 0.1.0
validations:
required: true
- type: input
id: operating_system
attributes:
label: Operating System
placeholder: ex. Ubuntu 22.04
validations:
required: true
- type: input
id: softwares
attributes:
label: Softwares versions
placeholder: ex. SPM12 - version 7219 / FSL 5.0.9 / Docker 23.0.3
validations:
required: true
- type: textarea
id: screenshot
attributes:
label: Screenshots
description: If applicable, add screenshots to help explain your problem.
validations:
required: false
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Feature request
description: Suggest an idea for the project!
title: "[ENH] "
labels: ["\U0001F6A6 status: awaiting triage"]
body:
- type: markdown
attributes:
value: |
Thanks for suggesting this feature! :raised_hands:
- type: input
id: goal
attributes:
label: Goal
description: Please briefly describe the purpose of your request.
placeholder: ex. Create a template for pipelines using AFNI.
validations:
required: true
- type: textarea
id: why-useful
attributes:
label: Why this is useful
description: Why you think the project could benefit from the feature.
placeholder: ex. This would help contributors to start writing pipeline code using AFNI.
validations:
required: true
- type: textarea
id: timeline
attributes:
label: Timeline
description: If there are any time limitations for the issue to be resolved, please write it here.
placeholder: ex. Must be done before we present the code to the AFNI convention.
validations:
required: false
- type: textarea
id: description
attributes:
label: More specifically
description: A clear description of what you want to happen.
placeholder: Add any context or screenshots about the feature request here.
validations:
required: false
- type: textarea
id: questions
attributes:
label: Open questions
description: Please fill this part if there are subjects left to discussion for this request. You can also describe alternatives you've considered.
placeholder: ex. I'm not sure which version of AFNI tu use.
validations:
required: false
23 changes: 0 additions & 23 deletions .github/ISSUE_TEMPLATE/pipeline_reproduction.md

This file was deleted.

61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/pipeline_reproduction.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Pipeline reproduction
description: Select this when you are about to start a pipeline reproduction.
title: "[team_id] Pipeline reproduction"
labels: ["\U0001F6A6 status: awaiting triage"]
body:
- type: markdown
attributes:
value: |
Thank you for starting this pipeline reproduction! :tada:
Please make sure there is no concurrent issue about it : have a look [here](https://github.com/Inria-Empenn/narps_open_pipelines/wiki/pipeline_status).
Once it's ok, start by changing the `team_id` in the title of this issue, then fill the form.

:warning: Please do not reference any other team IDs in the following, unless the issue is actually related these IDs.

- type: textarea
id: softwares
attributes:
label: Softwares
description: Which softwares are used by the pipeline ?
placeholder: Basically, this is the `general.software` column of the pipeline description.
validations:
required: true

- type: dropdown
id: data
attributes:
label: Input data
description: Which data used the team ?
options:
- raw data
- derivatives (fMRIprep)
validations:
required: true

- type: textarea
id: context
attributes:
label: Additional context
description: Any supplementary information you find relevant about the pipeline, that would help reproducing it.
placeholder: ex. This pipeline uses a run level analysis.
validations:
required: true

- type: textarea
id: tasks
attributes:
label: List of tasks
description: Please keep the following tasks, as they are common to all pipeline reproduction. Feel free to add other tasks.
value: |
Please tick the boxes below once the corresponding task is finished. :+1:
- [ ] :ok_hand: A maintainer of the project approved the issue, by assigning a :checkered_flag:`status: ready for dev` label to it.
- [ ] :deciduous_tree: Create a branch on your fork to start the reproduction.
- [ ] :sunrise: Create a file `team_{team_id}.py` inside the [`narps_open/pipelines/`](https://github.com/Inria-Empenn/narps_open_pipelines/blob/main/narps_open/pipelines) directory. You can use a file inside [`narps_open/pipelines/templates`](https://github.com/Inria-Empenn/narps_open_pipelines/blob/main/narps_open/pipelines/templates) as a template if needed.
- [ ] :inbox_tray: Create a [pull request](https://github.com/Inria-Empenn/narps_open_pipelines/blob/main/CONTRIBUTING.md#pull_requests) as soon as you completed the previous task.
- [ ] :brain: Write the code for the pipeline, using Nipype and the file architecture described in [docs/pipelines.md](https://github.com/Inria-Empenn/narps_open_pipelines/blob/main/docs/pipelines.md).
- [ ] :blue_book: Make sure your code is documented enough.
- [ ] :snake: Make sure your code is explicit and conforms with PEP8.
- [ ] :microscope: Create tests for your pipeline. You can use files in [`tests/pipelines/test_team_*`](https://github.com/Inria-Empenn/narps_open_pipelines/blob/main/tests/pipelines/) as examples.
- [ ] :microscope: Make sure your code passes all the tests you created (see [docs/testing.md](https://github.com/Inria-Empenn/narps_open_pipelines/blob/main/docs/testing.md)).
validations:
required: true
14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/staff-feature-request.md

This file was deleted.

26 changes: 0 additions & 26 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

This file was deleted.

20 changes: 20 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
This Pull Request is related to issue [#](add a link to the issue here).

Before reviewing this Pull Request, please review Pull Request [#](add a link to the Pull Request here).

Changes proposed in this Pull Request:

-
-
-

Checklist:

- [ ] Descriptive title
- [ ] Targets the `main` branch
- [ ] Changes are functional
- [ ] My code is explicit and comments were added to it
- [ ] Code conforms with PEP8
- [ ] Tests were added for the changes and they complete successfully
- [ ] Existing tests were updated (if needed) and they complete successfully
- [ ] Documentation was updated
13 changes: 8 additions & 5 deletions .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
@@ -8,9 +8,11 @@ on:
push:
paths:
- '**.py'
- '.github/workflows/code_quality.yml'
pull_request:
paths:
- '**.py'
- '.github/workflows/code_quality.yml'

# Jobs that define the workflow
jobs:
@@ -33,22 +35,23 @@ jobs:
- uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-pylint
key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }}
restore-keys: |
${{ runner.os }}-pip-pylint
${{ runner.os }}-pip-

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pylint
pip install .[tests]

- name: Analyse the code with pylint
run: |
pylint --exit-zero narps_open > pylint_report_narps_open.txt
pylint --exit-zero tests > pylint_report_narps_open.txt
pylint --fail-under 8 --ignore-paths narps_open/pipelines/ narps_open > pylint_report_narps_open.txt
pylint --fail-under 8 tests > pylint_report_tests.txt

- name: Archive pylint results
uses: actions/upload-artifact@v3
if: failure() # Only if previous step failed
with:
name: pylint-reports-python
path: |
22 changes: 22 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
## Disclaimer - This GitHub Actions workflow performs a check for spelling errors inside code comments and documentation
name: codespell

on:
push:
branches: [main]
pull_request:
branches: [main]

permissions:
contents: read

jobs:
codespell:
name: Check for spelling errors
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Codespell
uses: codespell-project/actions-codespell@v2
Loading