Skip to content

New bru2nii pull request #1507

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 56 commits into from
Closed

New bru2nii pull request #1507

wants to merge 56 commits into from

Conversation

TheChymera
Copy link
Collaborator

Replaces #1425 for which the history got messed up.

@TheChymera
Copy link
Collaborator Author

@satra ?

@satra
Copy link
Member

satra commented Jun 17, 2016

same here: make specs

satra and others added 5 commits June 16, 2016 21:20
@satra
Merge pull request nipy#1511 from chrisfilo/fix/randomise_msg
fbaca01 
removed "experimental" warning of Randomise
@satra
Merge pull request nipy#1509 from poldrack/master
9ca70f4 
added logic to prevent directory creation collisions
@satra
Merge pull request nipy#1508 from TheChymera/doc
101989d 
correct usage of the DataGrabber node
This reverts commit 24d0935 (didn't work in python 3)
68154f7
nose's assert_raises and mock's patch don't play together well; futur…
ec075eb 
…e's raise_from requires exceptions to be imported without a qualifier
@TheChymera
Copy link
Collaborator Author

how do I do that? I have queried for make specs in the source tree, and I found no examples.

@satra
Merge pull request nipy#1513 from shoshber/mockdep
dbd5b65 
FIX/TST tests failing silently are bad
@satra
Copy link
Member

satra commented Jun 17, 2016

@TheChymera - it's in: https://github.com/nipy/nipype/blob/master/CONTRIBUTING.md

the Makefile is in the root nipype directory

satra and others added 19 commits June 18, 2016 21:07
@satra
Update CHANGES
ad3df96
@satra
skip wheel generation on travis
b729c40
@satra
updates for 0.12.0-rc2
76946fd
@satra
Merge pull request nipy#1519 from satra/rel/0.12.0-rc2
15a2bee 
updates for 0.12.0-rc2
@TheChymera
Interface for AFNI's 3dBlurToFWHM
bb6cf16
@TheChymera
corrected import
f8755f5
@TheChymera
updated doctest paths
49c09c0
DOC: (m) CHANGES policy, easier make check
1436a04
Merge pull request nipy#1520 from shoshber/contributing
725b738 
DOC: (m) CHANGES policy, easier make check
@TheChymera
Interface for AFNI's 3dBlurToFWHM
d3d1048
@TheChymera
corrected import
292bae4
@TheChymera
updated doctest paths
70428fe
@TheChymera
removed built-in setup.py develop
034be88
@TheChymera
removed exists from bool argument
73fe3c3
@TheChymera
Autogenerated test
d249694
@TheChymera
Merge branch '3dblur' of github.com:TheChymera/nipype into 3dblur
f89db4e
don't run setup.py in Makefile
603e7ed
@satra
Merge pull request nipy#1522 from shoshber/contributing
5e6dd05 
FIX don't run setup.py in Makefile
@satra
Merge pull request nipy#1512 from TheChymera/3dblur
adc6ed1 
Interface for AFNI's 3dBlurToFWHM
@satra
Copy link
Member

satra commented Jun 24, 2016

@TheChymera - can you update this one too.

@TheChymera
Copy link
Collaborator Author

why do these rebases blow up every once in a while? :-/

@TheChymera TheChymera closed this Jun 24, 2016
@TheChymera TheChymera deleted the bru2 branch June 24, 2016 10:00
@coveralls
Copy link

coveralls commented Jun 24, 2016 •
edited
Loading

Coverage Status

Coverage increased (+0.07%) to 72.263% when pulling 7f28c90 on TheChymera:bru2 into 3abf131 on nipy:master.

@TheChymera TheChymera mentioned this pull request Jun 24, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@TheChymera @satra @coveralls @Leoniela @poldrack @chrisgorgo