Skip to content

Update our master branch with runtime profiling and nipype re-base #8

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 516 commits into from
Feb 12, 2016

Conversation

pintohutch
Copy link

No description provided.

satra and others added 30 commits December 3, 2015 15:48
…se_current_prov

* origin/fix/use_current_prov:
  fix: changing commit format to support py3
…se_current_prov

* origin/fix/use_current_prov:
  fix: string decoding for prov literal and few pipeline job submission info statements
* upstream/master:
  fix: ensure that T2 file gets used to clean surface
fix: absolute to relative imports
Correct versions and consistency in install.rst
Previously, S3DataGrabber checked if outputs were lists or strings,
and changed them in those cases. However, if output was a unicode,
then it went unchanged. That's clearly not what we want, so we now
change in all cases: iterating through all values of output if it has
__iter__ attribute (is list-like), and using the value as the path if
it doesn't.
The invert_initial_moving_transform variable in RegistrationInputSpec
needs usedefault=True to fix "TypeError: int() argument must be a
string or a number, not '_Undefined'". This occurred in line 817
"do_invert_transform = int(self.inputs.invert_initial_moving_transform)".
* upstream/master:
  Correct versions and consistency in install.rst
  fix:import utils needed one more dot
  fix: absolute to relative imports
  add vtk version checking in fsl interfaces
  update CHANGES
  Fix nipy#1218 only, not addressing nipy#973
  force setting ETS_TOOLKIT before tvtk nipy#972
  Created TVTKBaseInterface. Should fix nipy#1218
…se_current_prov

* origin/fix/use_current_prov:
  fix: use text_type on str for exceptions
…sity

[ENH] Improved nosetest information
pintohutch and others added 27 commits February 3, 2016 15:49
Re-basing code with nipype master branch
…e loop in memory_profiler was executing node twice when it didnt finish running the first time
pintohutch added a commit that referenced this pull request Feb 12, 2016
Update our master branch with runtime profiling and nipype re-base
@pintohutch pintohutch merged commit 2ff06d3 into master Feb 12, 2016
pintohutch pushed a commit that referenced this pull request Mar 17, 2016
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.