Skip to content

Commit 41a793b

Browse files
authored
FIX: ICA Aroma (#170)
* FIX: Legacy imports * FIX: Add missing dependency for aroma * MAINT: RTD requirements - Remove matplotlib restriction now that niworkflows has eased - Avoid scipy 1.8.0 series until RTD python >= 3.8
1 parent 58eb2ff commit 41a793b

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ sphinx-argparse
44
# Relative to repository root
55
./wrapper/
66
# avoid downloading new matplotlib
7-
matplotlib ~= 3.3.1
7+
scipy ~= 1.7.3

nibabies/workflows/bold/confounds.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -713,9 +713,8 @@ def init_ica_aroma_wf(
713713
714714
"""
715715
from niworkflows.engine.workflows import LiterateWorkflow as Workflow
716-
from niworkflows.interfaces.segmentation import ICA_AROMARPT
717-
from niworkflows.interfaces.utility import KeySelect
718-
from niworkflows.interfaces.utils import TSV2JSON
716+
from niworkflows.interfaces.reportlets.segmentation import ICA_AROMARPT
717+
from niworkflows.interfaces.utility import KeySelect, TSV2JSON
719718

720719
workflow = Workflow(name=name)
721720
workflow.__postdesc__ = """\

setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ exclude =
5959
*.tests
6060

6161
[options.extras_require]
62+
aroma =
63+
future
6264
doc =
6365
sphinx
6466
sphinx_rtd_theme
@@ -83,6 +85,7 @@ test =
8385
tests =
8486
%(test)s
8587
all =
88+
%(aroma)s
8689
%(doc)s
8790
%(duecredit)s
8891
%(pointclouds)s

0 commit comments

Comments
 (0)