Skip to content

Conversation

@mgxd
Copy link
Collaborator

@mgxd mgxd commented May 1, 2020

This bumps the minimum templateflow to 0.6.0, which includes an automatic update mechanism to update the local template skeleton.

This should reduce the burden of having to update the python templateflow client every time a change has been made to the skeleton.

@auto-comment

This comment has been minimized.

@mgxd
Copy link
Collaborator Author

mgxd commented May 1, 2020

it looks like sdcflows 1.2.3 introduces an error with the doc build

Warning, treated as error:
/usr/local/lib/python3.7/site-packages/fmriprep/workflows/base.py:docstring of fmriprep.workflows.base.init_fmriprep_wf:10:Exception occurred in plotting api-1
 from /tmp/src/fmriprep/docs/api.rst:
Traceback (most recent call last):
  File "/usr/local/lib/python3.7/site-packages/nipype/sphinxext/plot_workflow.py", line 474, in run_code
    exec(code, ns)
  File "<string>", line 49, in <module>
  File "/usr/local/lib/python3.7/site-packages/fmriprep/workflows/base.py", line 274, in init_fmriprep_wf
    bids_filters=bids_filters,
  File "/usr/local/lib/python3.7/site-packages/fmriprep/workflows/base.py", line 638, in init_single_subject_wf
    use_syn=use_syn,
  File "/usr/local/lib/python3.7/site-packages/fmriprep/workflows/bold/base.py", line 688, in init_func_preproc_wf
    fmap_unwarp_report_wf = init_sdc_unwarp_report_wf()
  File "/usr/local/lib/python3.7/site-packages/sdcflows/workflows/outputs.py", line 46, in init_sdc_unwarp_report_wf
    from niworkflows.utils.images import dseg_label as _dseg_label
ImportError: cannot import name 'dseg_label' from 'niworkflows.utils.images' (/usr/local/lib/python3.7/site-packages/niworkflows/utils/images.py)

@oesteban
Copy link
Member

oesteban commented May 1, 2020

You'll need to pin niworkflows instead (nipreps/niworkflows@34b40c4#diff-d2098e59c3e86fab94a1afb30f4dfefeR112)

niworkflows >= 1.2.0rc4, < 1.3
sdcflows ~= 1.2.3

@mgxd
Copy link
Collaborator Author

mgxd commented May 1, 2020

sure we could, but didn't we create #2054 as a reference for our dependency tree?

@oesteban
Copy link
Member

oesteban commented May 1, 2020

Okay sorry, this pr is not against master

@mgxd
Copy link
Collaborator Author

mgxd commented May 1, 2020

if this looks good, I'd like to get this out and cut a new release for the 20.0.x series

@oesteban
Copy link
Member

oesteban commented May 1, 2020

go for it :)

@effigies
Copy link
Member

effigies commented May 1, 2020

So, wait, we released an incompatible version of sdcflows in the 1.2.x series? Should we delete it from PyPI and re-release as 1.3.0?

@mgxd
Copy link
Collaborator Author

mgxd commented May 4, 2020

that would probably be the cleanest way to ensure we could still update sdcflows in the 20.x series.

@oesteban
Copy link
Member

oesteban commented May 4, 2020 via email

@effigies
Copy link
Member

effigies commented May 4, 2020

So looks like we should delete 1.2.3, branch maint/1.2.x off of 1.2.2, and re-release 1.2.3 as 1.3.0.

Is there any good reason to base 1.2.4 off of the current master?

@mgxd mgxd force-pushed the maint/templateflow-update branch from 6f0bf0a to 73fa1fb Compare May 4, 2020 19:37
@mgxd mgxd force-pushed the maint/templateflow-update branch from 73fa1fb to 5a4b6ee Compare May 4, 2020 20:53
@mgxd
Copy link
Collaborator Author

mgxd commented May 4, 2020

@mgxd
Copy link
Collaborator Author

mgxd commented May 5, 2020

things are working, and reports look comparable to 20.0.6 release CI, so i'm going to merge here

@mgxd mgxd merged commit 61d3b36 into nipreps:maint/20.0.x May 5, 2020
@mgxd mgxd deleted the maint/templateflow-update branch May 5, 2020 12:45
@effigies
Copy link
Member

effigies commented May 5, 2020

I think the ds210 weirdness is related to --t2s-coreg, which we're deprecating anyway. It exists prior to #2109 in master and goes away after.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants