Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: skip t1w file existence check if anat_derivatives are provided #545

Merged
merged 3 commits into from
Jul 16, 2020

Conversation

bpinsard
Copy link
Contributor

Changes to allow processing dataset without T1w series if --anat_derivatives are provided.
See nipreps/fmriprep#2201

@pull-assistant
Copy link

pull-assistant bot commented Jun 26, 2020

Score: 0.40

Best reviewed: with all changes


Optimal code review plan (3 commits squashed)

skip t1w file existe... ... fix BIDSDataGrabber

Squashed 3 commits:

Powered by Pull Assistant. Last update fc197ca ... fc4cfdc. Read the comment docs.

@bpinsard bpinsard force-pushed the fix/skip_t1w_check_if_precom_anat branch from 2f3931a to 526ba69 Compare June 26, 2020 01:16
@pep8speaks
Copy link

pep8speaks commented Jun 26, 2020

Hello @bpinsard, Thank you for updating!

Cheers! There are no style issues detected in this Pull Request. 🍻 To test for issues locally, pip install flake8 and then run flake8 niworkflows.

Comment last updated at 2020-07-01 13:24:43 UTC

@bpinsard bpinsard force-pushed the fix/skip_t1w_check_if_precom_anat branch from 526ba69 to fc197ca Compare June 26, 2020 13:06
@codecov
Copy link

codecov bot commented Jul 1, 2020

Codecov Report

Merging #545 into master will decrease coverage by 12.74%.
The diff coverage is 66.66%.

Impacted file tree graph

@@             Coverage Diff             @@
##           master     #545       +/-   ##
===========================================
- Coverage   64.65%   51.90%   -12.75%     
===========================================
  Files          44       44               
  Lines        5375     5373        -2     
  Branches      786      782        -4     
===========================================
- Hits         3475     2789      -686     
- Misses       1742     2481      +739     
+ Partials      158      103       -55     
Flag Coverage Δ
#documentation 33.70% <0.00%> (-0.02%) ⬇️
#masks ?
#reportlettests 100.00% <ø> (ø)
#travis 0.48% <0.00%> (-59.35%) ⬇️
#unittests 48.40% <66.66%> (+0.01%) ⬆️
Impacted Files Coverage Δ
niworkflows/interfaces/bids.py 96.53% <66.66%> (+0.02%) ⬆️
niworkflows/interfaces/confounds.py 19.83% <0.00%> (-75.11%) ⬇️
niworkflows/viz/utils.py 9.33% <0.00%> (-70.25%) ⬇️
niworkflows/viz/plots.py 7.67% <0.00%> (-41.63%) ⬇️
niworkflows/interfaces/report_base.py 49.18% <0.00%> (-19.68%) ⬇️
niworkflows/interfaces/masks.py 43.78% <0.00%> (-18.35%) ⬇️
niworkflows/interfaces/mni.py 25.86% <0.00%> (-16.43%) ⬇️
niworkflows/interfaces/plotting.py 74.57% <0.00%> (-10.17%) ⬇️
niworkflows/utils/spaces.py 85.48% <0.00%> (-4.31%) ⬇️
niworkflows/interfaces/registration.py 46.12% <0.00%> (-3.27%) ⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b7f01bb...fc4cfdc. Read the comment docs.

@effigies
Copy link
Member

@mgxd Should we target 1.3.0 or 1.2.7 with this?

@mgxd
Copy link
Contributor

mgxd commented Jul 16, 2020

I think this is fine for either, but since the behavior will not be included into the 20.1.x series of fmriprep, I'm leaning towards 1.3.0 - wdyt?

@effigies
Copy link
Member

Sure. I just haven't kept up with the current status of dependencies. Merging into master.

@effigies effigies merged commit dbd2a97 into nipreps:master Jul 16, 2020
Copy link
Contributor

@mgxd mgxd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, minor suggestion to avoid an extra variable definition

niworkflows/interfaces/bids.py Show resolved Hide resolved
niworkflows/interfaces/bids.py Show resolved Hide resolved
@mgxd
Copy link
Contributor

mgxd commented Jul 16, 2020

oh, nevermind - it's in 😄

@effigies
Copy link
Member

Suggestion LGTM. Feel free to patch on master.

oesteban added a commit that referenced this pull request Aug 14, 2020
First release in the 1.3.x series. This release includes enhancements and bug-fixes
towards the release of the first LTS version of fMRIPrep.
PyBIDS has been revised to use more recent versions, a series of ANTs' interfaces
have been deemed ready to upstream into Nipype, and several improvements regarding
multi-echo EPI are included.
With thanks to Basile Pinsard for contributions.

  * FIX: Patch ``ApplyTransforms`` spec to permit identity in a chain (#554)
  * FIX: Add dots to extensions in PyBIDS' config file (#548)
  * FIX: Segmentation plots aligned with cardinal axes (#544)
  * FIX: Skip T1w file existence check if ``anat_derivatives`` are provided (#545)
  * FIX: Avoid diverting CIFTI dtype from original BOLD (#532)
  * ENH: Add ``smooth`` input to ``RegridToZooms`` (#549)
  * ENH: Enable ``DerivativesDataSink`` to take multiple source files to derive entities (#547)
  * ENH: Allow ``bold_reference_wf`` to accept multiple EPIs/SBRefs (#408)
  * ENH: Numerical stability of EPI brain-masks using probabilistic prior (#485)
  * ENH: Add a pure-Python interface to resample to specific resolutions (#511)
  * MAINT: Finalize upstreaming of ANTs' interfaces to Nipype (#550)
  * MAINT: Update to Python +3.6 (#541)
HippocampusGirl added a commit to HippocampusGirl/niworkflows that referenced this pull request Sep 29, 2020
1.3.0rc3

First release in the 1.3.x series. This release includes enhancements and bug-fixes
towards the release of the first LTS version of fMRIPrep.
PyBIDS has been revised to use more recent versions, a series of ANTs' interfaces
have been deemed ready to upstream into Nipype, and several improvements regarding
multi-echo EPI are included.
With thanks to Basile Pinsard for contributions.

* FIX: Patch ``ApplyTransforms`` spec to permit identity in a chain (nipreps#554)
* FIX: Add dots to extensions in PyBIDS' config file (nipreps#548)
* FIX: Segmentation plots aligned with cardinal axes (nipreps#544)
* FIX: Skip T1w file existence check if ``anat_derivatives`` are provided (nipreps#545)
* FIX: Avoid diverting CIFTI dtype from original BOLD (nipreps#532)
* ENH: Add ``smooth`` input to ``RegridToZooms`` (nipreps#549)
* ENH: Enable ``DerivativesDataSink`` to take multiple source files to derive entities (nipreps#547)
* ENH: Allow ``bold_reference_wf`` to accept multiple EPIs/SBRefs (nipreps#408)
* ENH: Numerical stability of EPI brain-masks using probabilistic prior (nipreps#485)
* ENH: Add a pure-Python interface to resample to specific resolutions (nipreps#511)
* MAINT: Finalize upstreaming of ANTs' interfaces to Nipype (nipreps#550)
* MAINT: Update to Python +3.6 (nipreps#541)
HippocampusGirl added a commit to HippocampusGirl/niworkflows that referenced this pull request Sep 29, 2020
1.3.0

First release in the 1.3.x series.
This release includes enhancements and bug-fixes towards the release of the first
LTS (*long-term support*) version of *fMRIPrep*.
*PyBIDS* has been revised to use more recent versions, a series of ANTs' interfaces
have been deemed ready to upstream into *Nipype*, and several improvements regarding
multi-echo EPI are included.
With thanks to Basile Pinsard for contributions.

* FIX: Patch ``ApplyTransforms`` spec to permit identity in a chain (nipreps#554)
* FIX: Add dots to extensions in PyBIDS' config file (nipreps#548)
* FIX: Segmentation plots aligned with cardinal axes (nipreps#544)
* FIX: Skip T1w file existence check if ``anat_derivatives`` are provided (nipreps#545)
* FIX: Avoid diverting CIFTI dtype from original BOLD (nipreps#532)
* ENH: Add ``smooth`` input to ``RegridToZooms`` (nipreps#549)
* ENH: Enable ``DerivativesDataSink`` to take multiple source files to derive entities (nipreps#547)
* ENH: Allow ``bold_reference_wf`` to accept multiple EPIs/SBRefs (nipreps#408)
* ENH: Numerical stability of EPI brain-masks using probabilistic prior (nipreps#485)
* ENH: Add a pure-Python interface to resample to specific resolutions (nipreps#511)
* MAINT: Upstream all bug-fixes in the 1.2.9 release
* MAINT: Finalize upstreaming of ANTs' interfaces to Nipype (nipreps#550)
* MAINT: Update to Python +3.6 (nipreps#541)
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.

4 participants