Skip to content

Adjust expected bvecs/bvals filenames for the Philips DWI case #1266

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

Merged
merged 1 commit into from
Nov 10, 2015

Conversation

mih
Copy link
Member

@mih mih commented Nov 6, 2015

dcm2nii removes a DWI volume and prefixes with 'x' accordingly.

Note: Patch is against 0.11.0 -- last version that runs on Debian jessie, as python-future is not available as a package (AFAICS).

@mih
Copy link
Member Author

mih commented Nov 6, 2015

BTW: Here is the story: nipy/heudiconv#13

@chrisgorgo
Copy link
Member

Could you rebase or merge master? It seems you are triggering some errors that we have fixed in the meantime.

@satra
Copy link
Member

satra commented Nov 6, 2015

@chrisfilo - both are failing on some conda issue, which michael didn't touch. and only on py2.7

@chrisgorgo
Copy link
Member

CircleCI is failing on bedpostx (which were fixed in master). Travis errors might be due to other issues.

@satra
Copy link
Member

satra commented Nov 6, 2015

@chrisfilo does circleci not do the testing on the merged pull request?

@chrisgorgo
Copy link
Member

CircleCI does not merge master into a PR branch before testing if this is what you are asking about.

@mih
Copy link
Member Author

mih commented Nov 9, 2015

I can rebase this onto master, but I will not be able to test the result in the same way. Actually, it is just a single commit, no need for rebase.

@mih mih force-pushed the dcm2nii_philips_dwi branch from 79b2dcc to edabcb0 Compare November 9, 2015 07:04
@mih
Copy link
Member Author

mih commented Nov 9, 2015

Cherry-picked the commit and force-pushed...

@mih
Copy link
Member Author

mih commented Nov 9, 2015

FTR: Don't think that the persisting failure has something to do with my patch.

@chrisgorgo
Copy link
Member

I fixed the travis failures and merged your other PR - we get some conflicts now. Could you look into this?

@mih mih force-pushed the dcm2nii_philips_dwi branch from edabcb0 to e17b4e6 Compare November 10, 2015 06:05
@mih
Copy link
Member Author

mih commented Nov 10, 2015

@chrisfilo Pushed rebase.

dcm2nii removes a DWI volume and prefixes with 'x' accordingly.
satra added a commit that referenced this pull request Nov 10, 2015
Adjust expected bvecs/bvals filenames for the Philips DWI case
@satra satra merged commit 8d26eec into nipy:master Nov 10, 2015
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