Skip to content

Commit f8f35d7

Browse files
authored
Merge pull request #408 from nipreps/enh/improve-standalone-cli
ENH: Standalone CLI now estimates fieldmaps
2 parents ee5b805 + a682abe commit f8f35d7

22 files changed

+1636
-137
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ jobs:
377377
python -m venv /tmp/venv
378378
source /tmp/venv/bin/activate
379379
python -m pip install -U build hatch hatchling pip twine docutils
380-
python -m pip install --no-cache-dir -r docs/requirements.txt
380+
python -m pip install .[docs]
381381
- run:
382382
name: Build only this commit
383383
command: |

.github/workflows/pythonpackage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
python-version: 3
6464
- name: Display Python version
6565
run: python -c "import sys; print(sys.version)"
66-
- name: Build niworkflows
66+
- name: Build sdcflows
6767
run: pipx run build
6868
- name: Check distributions
6969
run: pipx run twine check dist/*
@@ -78,7 +78,7 @@ jobs:
7878
runs-on: ubuntu-latest
7979
strategy:
8080
matrix:
81-
python-version: ["3.10", "3.12"]
81+
python-version: ["3.9", "3.12"]
8282
install: [repo, sdist, wheel, editable]
8383

8484
env:

.github/workflows/unittests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
strategy:
3535
max-parallel: 5
3636
matrix:
37-
python-version: ["3.10", "3.11", "3.12"]
37+
python-version: ["3.9", "3.10", "3.11", "3.12"]
3838

3939
steps:
4040
- uses: actions/cache@v3

docs/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# You can set these variables from the command line.
55
SPHINXOPTS =
66
SPHINXBUILD = sphinx-build
7+
SPHINX_APIDOC_OPTIONS = members,show-inheritance
78
PAPER =
89
BUILDDIR = _build
910
OUTDIR = html
@@ -57,7 +58,7 @@ docs-coverage:
5758
PYTHONPATH=$(PYTHONPATH) $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage
5859

5960
html:
60-
PYTHONPATH=$(PYTHONPATH) $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/$(OUTDIR)
61+
PYTHONPATH=$(PYTHONPATH) SPHINX_APIDOC_OPTIONS=$(SPHINX_APIDOC_OPTIONS) $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/$(OUTDIR)
6162
@echo
6263
@echo "Build finished. The HTML pages are in $(BUILDDIR)/$(OUTDIR)."
6364

docs/_static/config-example.toml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
[environment]
2+
cpu_count = 36
3+
exec_env = "posix"
4+
free_mem = 13.7
5+
overcommit_policy = "heuristic"
6+
overcommit_limit = "50%"
7+
nipype_version = "1.8.7.dev0"
8+
templateflow_version = "23.0.0"
9+
total_memory = 62.51573181152344
10+
version = "2.6.1.dev5+gaa86b0b08f.d20231128"
11+
12+
[execution]
13+
ants_float = false
14+
bids_dir = "/data/datasets/hcph"
15+
bids_database_dir = "/data/datasets/hcph/.bids-index"
16+
bids_database_wipe = false
17+
cwd = "/home/oesteban/tmp/sdcflows-hcph"
18+
debug = false
19+
dry_run = false
20+
layout = "BIDS Layout: .../data/datasets/hcph | Subjects: 1 | Sessions: 59 | Runs: 4"
21+
log_dir = "/home/oesteban/tmp/sdcflows-hcph/out/logs"
22+
log_level = 15
23+
notrack = false
24+
output_dir = "/home/oesteban/tmp/sdcflows-hcph/out"
25+
participant_label = [ "001",]
26+
pdb = false
27+
run_uuid = "20231129-112254_e9d6d38e-35ff-463e-9f7e-1ff15ecd54ac"
28+
templateflow_home = "/data/templateflow"
29+
work_dir = "/home/oesteban/tmp/sdcflows-hcph/work"
30+
write_graph = false
31+
32+
[workflow]
33+
analysis_level = [ "participant",]
34+
fmapless = false
35+
species = "human"
36+
template_id = "MNI152NLin2009cAsym"
37+
38+
[nipype]
39+
crashfile_format = "txt"
40+
get_linked_libs = false
41+
local_hash_check = true
42+
nprocs = 8
43+
omp_nthreads = 16
44+
plugin = "MultiProc"
45+
remove_node_directories = false
46+
resource_monitor = false
47+
stop_on_first_crash = true
48+
49+
[execution.bids_filters]
50+
51+
[nipype.plugin_args]
52+
maxtasksperchild = 1
53+
raise_insufficient = false

docs/api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Information on specific functions, classes, and methods.
77
:glob:
88

99
api/sdcflows.cli
10+
api/sdcflows.config
1011
api/sdcflows.data
1112
api/sdcflows.fieldmaps
1213
api/sdcflows.interfaces

docs/cli.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Standalone command line usage
2+
=============================
3+
*SDCFlows* can execute fieldmap estimation from a BIDS-compliant dataset by using the *standalone command line interface*:
4+
5+
.. argparse::
6+
:module: sdcflows.cli.parser
7+
:func: _parser
8+
:prog: sdcflows

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"sphinx.ext.intersphinx",
3636
"sphinx.ext.mathjax",
3737
"sphinx.ext.viewcode",
38+
"sphinxarg.ext",
3839
"sphinxcontrib.apidoc",
3940
"nbsphinx",
4041
"nipype.sphinxext.apidoc",

docs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ Contents
99
installation
1010
examples
1111
methods
12+
cli
1213
api
1314
changes

docs/requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ matplotlib >= 2.2.0
77
nbsphinx
88
nibabel
99
nipype >= 1.5.1
10-
niworkflows ~= 1.6.3
10+
niworkflows >= 1.7.0
1111
numpy
1212
packaging
1313
pandoc
1414
pydot >= 1.2.3
1515
pydotplus
1616
scipy
1717
sphinx >= 7.2.2
18+
sphinx-argparse
1819
sphinxcontrib-apidoc
1920
templateflow
20-
traits < 6.4
21+
traits < 6.4

0 commit comments

Comments
 (0)