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

Refactor propspeed - updated #544

Merged
merged 6 commits into from Jan 6, 2015

Conversation

Projects
None yet
3 participants
@arokem
Member

arokem commented Jan 6, 2015

This supersedes #540, and includes the whitespace comments that @Garyfallidis made on the previous PR. Just trying to move things along here.

matthew-brett and others added some commits Jan 5, 2015

DOC: refactor propspeed docstrings / whitespace
Refactor to docstring format, adjust whitespace to PEP8-ish rules.
RF: remove unused inline functions
Inline functions to get data pointers not being used in this module.
DOC: more docstring fixes
Fixes to docstrings with better understanding of what the parameters
are.
RF+TST: use numpy approved data get / flag checks
Check that arrays that should be C-contiguous are in fact C-contiguous
for public-facing functions.

Use PyArray_DATA to get array data pointer, to adapt to newer numpy API.

Add tests for modified functions.
DOC+RF: add more comments to tests
Explain tests for non-contiguous arrays in propspeed.
@matthew-brett

This comment has been minimized.

Member

matthew-brett commented Jan 6, 2015

All good with me - feel free to merge when ready.

@Garyfallidis

This comment has been minimized.

Member

Garyfallidis commented Jan 6, 2015

Looks good. Just waiting for Travis to complete.

@Garyfallidis

This comment has been minimized.

Member

Garyfallidis commented Jan 6, 2015

Done!

Garyfallidis added a commit that referenced this pull request Jan 6, 2015

@Garyfallidis Garyfallidis merged commit da66cb9 into nipy:master Jan 6, 2015

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment