Skip to content

Commit 076c985

Browse files
effigieseffigies
committed
Merge pull request #506 from effigies/feat/derivatives
feat: Save mask to derivatives, pass derivatives to outputnode
2 parents 3b9ff3a + 07d7a27 commit 076c985

Some content is hidden

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

77 files changed

+3021
-2954
lines changed

‎.circleci/version.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
"""Get sdcflows version."""
2+
23
import sdcflows
34

4-
print(sdcflows.__version__, end="", file=open("/tmp/.docker-version.txt", "w"))
5+
with open('/tmp/.docker-version.txt', 'w') as f:
6+
f.write(sdcflows.__version__)

‎.git-blame-ignore-revs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Thu May 15 11:41:29 2025 -0400 - [email protected] - chore: Manual ruff fixes [ignore-rev]
2+
e5153dbc00b089144b9f4b415234b27c58b2388b
3+
# Thu May 15 11:11:38 2025 -0400 - [email protected] - run: ruff check --fix [ignore-rev]
4+
2bb216b0a12612e31713b34d8ab2ee98fa2cc703
5+
# Thu May 15 09:34:34 2025 -0400 - [email protected] - run: ruff check --fix [ignore-rev]
6+
dc3706038661984718da079e24a863842407a837
7+
# Thu May 15 09:29:29 2025 -0400 - [email protected] - run: ruff format [ignore-rev]
8+
d97ae316c0bdf71084a0732760ceed5221033fc2
9+
# Thu May 15 09:26:57 2025 -0400 - [email protected] - run: ruff check --fix [ignore-rev]
10+
cacd409cce71f2e530ad1bd1e8b79f397cab81d4
11+
# Thu May 15 09:22:00 2025 -0400 - [email protected] - run: pre-commit run --all [ignore-rev]
12+
2b40bee0d6b2c88628760a8b1513851a439411e8

‎.git_archival.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node: $Format:%H$
22
node-date: $Format:%cI$
33
describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$
4-
ref-names: $Format:%D$
4+
ref-names: $Format:%D$

‎.github/workflows/build-test-publish.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
id-token: write
4444

4545
steps:
46-
- uses: actions/checkout@v4
46+
- uses: actions/checkout@v5
4747
with:
4848
fetch-depth: 0
4949
- uses: hynek/build-and-inspect-python-package@v2
@@ -65,27 +65,27 @@ jobs:
6565
strategy:
6666
fail-fast: false
6767
matrix:
68-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
68+
python-version: ["3.10", "3.11", "3.12", "3.13"]
6969
dependencies: ["latest", "pre"]
7070
marks: ["fast"]
7171
include:
72-
- python-version: "3.9"
72+
- python-version: "3.10"
7373
dependencies: "min"
7474
marks: "fast"
75-
- python-version: "3.9"
75+
- python-version: "3.10"
7676
dependencies: "latest"
7777
marks: "slow"
78-
- python-version: "3.12"
78+
- python-version: "3.13"
7979
dependencies: "latest"
8080
marks: "veryslow"
8181
exclude:
82-
- python-version: "3.9"
83-
dependencies: "pre"
8482
- python-version: "3.10"
8583
dependencies: "pre"
84+
- python-version: "3.11"
85+
dependencies: "pre"
8686

8787
steps:
88-
- uses: actions/checkout@v4
88+
- uses: actions/checkout@v5
8989
- uses: actions/cache@v4
9090
with:
9191
path: /var/lib/apt
@@ -245,7 +245,7 @@ jobs:
245245

246246
steps:
247247
- name: Download packages built by build-and-inspect-python-package
248-
uses: actions/download-artifact@v4
248+
uses: actions/download-artifact@v5
249249
with:
250250
name: Packages
251251
path: dist

‎.github/workflows/docs-build-update.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Build & update docs
33

44
on:
55
push:
6-
branches: [ 'doc/*', 'docs/*', master, "maint/*" ]
6+
branches: [ 'doc/*', 'docs/*', master, main, "maint/*" ]
77
tags: [ '*' ]
88
pull_request:
9-
branches: [ master, 'maint/*' ]
9+
branches: [ master, main, 'maint/*' ]
1010

1111
concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
with:
2323
ssh-key: "${{ secrets.NIPREPS_DEPLOY }}"
2424
fetch-depth: 0
@@ -49,7 +49,7 @@ jobs:
4949
sudo apt-get install -y --no-install-recommends graphviz pandoc texlive
5050
5151
- name: Set up Python 3
52-
uses: actions/setup-python@v5
52+
uses: actions/setup-python@v6
5353
with:
5454
python-version: 3
5555

@@ -92,17 +92,17 @@ jobs:
9292
git push
9393
9494
- name: Push "master" docs to gh-pages after a push to master (typically, a PR merge).
95-
if: github.ref == 'refs/heads/master'
95+
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
9696
run: |
97-
if [[ "${CURBRANCH}" != "master" ]]; then
97+
if [[ "${CURBRANCH}" != "master" && "${CURBRANCH}" != "main" ]]; then
9898
echo "$CURBRANCH is not the default development branch"
9999
exit 1
100100
fi
101101
git checkout -b gh-pages origin/gh-pages
102-
git rm -r master/ || true
102+
git rm -r ${CURBRANCH}/ || true
103103
# It is fundamental that the directory does not exist at all.
104-
rm -rf master
105-
cp -r $HOME/docs/$CURBRANCH $PWD/master
106-
git add master
107-
git commit -am "docs(master): Update docs of development line" || true
104+
rm -rf ${CURBRANCH}
105+
cp -r $HOME/docs/$CURBRANCH $PWD/${CURBRANCH}
106+
git add ${CURBRANCH}
107+
git commit -am "docs(${CURBRANCH}): Update docs of development line" || true
108108
git push

‎.github/workflows/validate.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@ permissions:
1717
contents: read
1818

1919
jobs:
20-
flake8:
20+
style:
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v4
24-
- run: pipx run flake8-pyproject sdcflows/
23+
- uses: actions/checkout@v5
24+
- run: pipx run ruff check sdcflows/
25+
- run: pipx run ruff format --diff sdcflows/
2526

2627
# codespell:
2728
# runs-on: ubuntu-latest
2829
# steps:
29-
# - uses: actions/checkout@v4
30+
# - uses: actions/checkout@v5
3031
# - uses: codespell-project/actions-codespell@v2

‎.mailmap‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,18 @@ Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-
3838
Krzysztof J. Gorgolewski <[email protected]> <filo@filo-Precision-M6500>
3939
Krzysztof J. Gorgolewski <[email protected]> <filo@filolaptop>
4040
Krzysztof J. Gorgolewski <[email protected]> <[email protected]>
41+
Lea Waller <[email protected]> <[email protected]>
4142
Marc Bue <[email protected]>
4243
Markus H. Sneve <[email protected]> <[email protected]>
4344
Mathias Goncalves <[email protected]>
4445
Mathias Goncalves <[email protected]> <[email protected]>
4546
Mathias Goncalves <[email protected]> <[email protected]>
47+
Mathieu Dugré <[email protected]>
4648
Matteo Visconti di Oleggio Castello <[email protected]>
4749
Marc Bue <[email protected]>
4850
Marc Bue <[email protected]> marcbue <[email protected]>
4951
Mikael Naveau <[email protected]>
52+
Milton Camacho <[email protected]>
5053
Nir Jacoby <[email protected]>
5154
Nir Jacoby <[email protected]> <[email protected]>
5255
Noah C. Benson <[email protected]>
@@ -67,3 +70,4 @@ Shoshana Berleant <[email protected]> <[email protected]>
6770
Soichi Hayashi <[email protected]>
6871
William Hedley Thompson <[email protected]>
6972
William Hedley Thompson <[email protected]> <[email protected]>
73+
Yasser Aleman <[email protected]>

‎.maint/CONTRIBUTORS.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,20 @@ Before every release, unlisted contributors will be invited again to add their n
99
| **Lastname** | **Name** | **Handle** | **ORCID** | **Affiliation** |
1010
| --- | --- | --- | --- | --- |
1111
| Adebimpe | Azeez | @a3sha2 | 0000-0001-9049-0135 | Perelman School of Medicine, University of Pennsylvania, PA, USA |
12+
| Aleman | Yasser | @yasseraleman | | |
1213
| Blair | Ross W. | @rwblair | 0000-0003-3007-1056 | Department of Psychology, Stanford University, CA, USA |
14+
| Camacho | Milton | @miltoncamacho | | |
1315
| Cieslak | Matthew | @mattcieslak | 0000-0002-1931-4734 | Perelman School of Medicine, University of Pennsylvania, PA, USA |
16+
| Dugré | Mathieu | @mathdugre | 0000-0003-2828-6031 | Concordia University |
17+
| Legarreta Gorroño | Jon Haitz | @jhlegarreta | 0000-0002-9661-1396 | Brigham and Women's Hospital, Mass General Brigham, Harvard Medical School, MA, USA |
1418
| MacNicol | Eilidh | @eilidhmacnicol | 0000-0003-3715-7012 | Department of Neuroimaging, King's College London |
19+
| Marabotto | Julien | @jmarabotto | 0009-0003-7070-5217 | Lausanne University Hospital and University of Lausanne, Lausanne, Switzerland |
1520
| Meisler | Steven | @smeisler | 0000-0002-8888-1572 | Speech & Hearing Bioscience & Technology Program, Harvard University |
1621
| Naveau | Mikaël | @naveau | 0000-0001-6948-9068 | Cyceron, UMS 3408 (CNRS - UCBN), France |
1722
| Pinsard | Basile | @bpinsard | 0000-0002-4391-3075 | University of Montréal, Montréal, Canada |
23+
| Sadil | Patrick | @psadil | 0000-0003-4141-1343 | Johns Hopkins Bloomberg School of Public Health |
1824
| Salo | Taylor | @tsalo | 0000-0001-9813-3167 | Perelman School of Medicine, University of Pennsylvania, PA, USA |
1925
| Sitek | Kevin R. | @sitek | 0000-0002-2172-5786 | Speech & Hearing Bioscience & Technology Program, Harvard University |
2026
| Sneve | Markus H. | @markushs | 0000-0001-7644-7915 | Center for Lifespan Changes in Brain and Cognition, University of Oslo |
27+
| Waller | Lea | @hippocampusgirl | 0000-0002-3239-6957 | Charite Universitatsmedizin Berlin, Germany |
28+
| Zwiers | Marcel | @marcelzwiers | | |

0 commit comments

Comments
 (0)