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] Missing report output - #1339 #1346

Merged
merged 4 commits into from
Oct 25, 2018
Merged

[FIX] Missing report output - #1339 #1346

merged 4 commits into from
Oct 25, 2018

Conversation

kasbohm
Copy link
Contributor

@kasbohm kasbohm commented Oct 25, 2018

Fixes #1339
The previous version failed on edge cases where 'anat', 'fmap', 'func', 'dwi' strings were found in the file path, for example, if a session was named ses-noanatomicals. Output files were then placed wrongly.

Changes proposed in this pull request

Proposed small change to how mod is set (to the name of parent folder of self.inputs.source_file). This requires valid BIDS structure, but I assume that can be assumed.

Are there cases where self.inputs.source_file can be something other than 'anat', 'fmap', 'func', 'dwi' so we need to create exceptions/tests for that?

See issue #1339 
Previous version failed if 'anat', 'fmap', 'func', 'dwi' strings were found in file path, for example ses-noanatomicals. 
Changed to name of parent folder of source_file (requires valid BIDS structure).
@welcome
Copy link

welcome bot commented Oct 25, 2018

Thanks for opening this pull request! We have detected this is the first time for you to contribute to fMRIPrep. Please check out our contributing guidelines.
We invite you to list yourself as a fMRIPrep contributor, so if your name is not already mentioned, please modify the .zenodo.json file with your data right above Russ' entry. Example:

{
   "name": "Contributor, New FMRIPrep",
   "affiliation": "Department of fMRI prep'ing, Open Science Made-Up University",
   "orcid": "<your id>"
},
{
   "name": "Poldrack, Russell A.",
   "affiliation": "Department of Psychology, Stanford University",
   "orcid": "0000-0001-6755-0259"
},

Of course, if you want to opt-out this time there is no problem at all with adding your name later. You will be always welcome to add it in the future whenever you feel it should be listed.

@effigies
Copy link
Member

Thanks for this! I think it should be okay, but I'll try to have a more critical look at some point today.

@oesteban oesteban changed the title FIX: Missing report output [FIX] Missing report output - #1339 Oct 25, 2018
@oesteban
Copy link
Member

oesteban commented Oct 25, 2018

Hi @kasbohm, thanks a lot for this contribution. I've just submitted a PR to your branch adding a doctest for the test-case you are fixing. It will also synchronize with master (so we should not see the red cross for ds005 anymore).

Please also confirm if you want to add your name to the .zenodo.json file.

Thanks very much!

@kasbohm
Copy link
Contributor Author

kasbohm commented Oct 25, 2018

Hi @effigies and @oesteban! Thanks, do I just merge the PR on my fork, and would this step have been avoided if I had performed a git merge upstream/master before committing? Please add me to the .zenodo.json if that is appropriate.

Cheers!

@oesteban
Copy link
Member

do I just merge the PR on my fork, and would this step have been avoided if I had performed a git merge upstream/master before committing?

I could've pushed to your branch directly, but I preferred the PR route. My PR is for adding a new test-case that your PR is fixing. As a side effect, it will resync your branch with master. But the relevant part is the new test. So please, merge the PR in so the new test is run with your patch.

Please add me to the .zenodo.json if that is appropriate.

This is really your decision. There is no commitment if you opt-in, although some people prefer to opt-out. If you opt-in, please add your name as indicated above.

@oesteban
Copy link
Member

Thanks for merging!. Now we will wait for the test_pytest build. If this PR works as promised (and I agree with Chris that it seems it will), then this should not fail anymore.

@oesteban
Copy link
Member

The test passed, merging in.

@oesteban oesteban merged commit 0d582f6 into nipreps:master Oct 25, 2018
@effigies effigies added this to the 1.2.0 milestone Oct 25, 2018
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.

Missing report output
3 participants