Skip to content

Commit 1a9efb6

Browse files
Redo the scan grouping so it uses modern BIDS and is easier to understand (#1092)
* initial try at a grouping module/cli * add some more checks, warnings * use new groups at the beginning of qsiprep * docs issue * update base.py to use new grouping * first pass into the workflows * propagate grouping to more workflows * keep going * fix summary bug * fix drbuddi reports * fix remaining tests * use extremely cool grouping notebook for docs * demote intendedfor * limit full text testing * switch to myst ipynb * use real bids fields for the grouping tutorial * [DATALAD RUNCMD] bash -lc 'if pixi lock --check; then ech... === Do not change lines below === { "chain": [], "cmd": "bash -lc 'if pixi lock --check; then echo '\"'\"'Lockfile up to date'\"'\"'; else pixi lock; fi'", "exit": 0, "extra_inputs": [], "inputs": [ "pixi.lock", "pyproject.toml" ], "outputs": [ "pixi.lock" ], "pwd": "." } ^^^ Do not change lines above ^^^ * start implementing the final default concatenation * CI failure * rpe_drbuddi merge * continue to try to fix CI * tsv/csv issues when concatenating * handle tortoise splits and fallback for unpaired * add support for MultipartID lists * require unique b0fields across sessions * rename "benchmarking" to "virtual acquisition" --------- Co-authored-by: nipreps[bot] <bot@nipreps.org>
1 parent 9fd5d40 commit 1a9efb6

115 files changed

Lines changed: 11195 additions & 426 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ scratch/
100100
notebooks/*
101101
!notebooks/*.ipynb
102102

103+
# The grouping tutorial is committed as a MyST .md notebook; ipynb copies
104+
# converted with jupytext for interactive use stay local.
105+
docs/notebooks/*.ipynb
106+
103107
# pixi environments
104108
.pixi/*
105109
!.pixi/config.toml

docs/comparisons.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ their current feature sets. These other
4747
| | QSIPrep | Tractoflow | PreQual | MRtrix3_connectome |
4848
| ----------------------------- | :---------------: | :--------: | :-----: | :----------------: |
4949
| Automated methods boilerplate |||||
50-
| HTML Preprocessing Report | [NiWorkflows-based](preprocessing.html#visual-reports) || Custom | EddyQuad |
50+
| HTML Preprocessing Report | {ref}`NiWorkflows-based <visual_reports>` || Custom | EddyQuad |

docs/conf.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,27 @@
4343
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
4444
# ones.
4545
extensions = [
46-
'nbsphinx',
46+
'myst_nb', # notebooks and markdown (replaces nbsphinx + recommonmark)
4747
'nipype.sphinxext.apidoc',
4848
'nipype.sphinxext.plot_workflow',
49-
'recommonmark',
5049
'sphinx.ext.autodoc',
5150
'sphinx.ext.coverage',
5251
'sphinx.ext.doctest',
5352
'sphinx.ext.intersphinx',
5453
'sphinx.ext.linkcode',
5554
'sphinx.ext.mathjax',
56-
'sphinx_markdown_tables',
5755
'sphinxarg.ext', # argparse extension
5856
'sphinxcontrib.apidoc',
5957
'sphinxcontrib.bibtex',
6058
]
6159

60+
# Notebooks are MyST markdown (clean git diffs, no committed outputs) and
61+
# are executed during the docs build, which doubles as a regression test
62+
# for their demos. 'cache' skips re-execution when a notebook is unchanged.
63+
nb_execution_mode = 'cache'
64+
nb_execution_raise_on_error = True
65+
nb_execution_timeout = 300
66+
6267
# Mock modules in autodoc:
6368
autodoc_mock_imports = [
6469
'matplotlib',
@@ -115,7 +120,9 @@
115120
# List of patterns, relative to source directory, that match files and
116121
# directories to ignore when looking for source files.
117122
# This patterns also effect to html_static_path and html_extra_path
118-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
123+
# notebooks/*.ipynb are local jupytext conversions of the committed MyST .md
124+
# notebooks (gitignored); exclude them so sphinx never prefers a stale copy.
125+
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'notebooks/*.ipynb']
119126

120127
# The reST default role (used for this markup: `text`) to use for all
121128
# documents.

docs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Contents
1717
quickstart
1818
usage
1919
preprocessing
20+
notebooks/grouping_tutorial
2021
reconstruction
2122
contributors
2223
changes

0 commit comments

Comments
 (0)