Skip to content

[ENH] Improved PEP8 Compliance for interfaces/fsl #1597

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 13 commits into from
Sep 8, 2016
Merged

Conversation

mgclark
Copy link
Contributor

@mgclark mgclark commented Aug 31, 2016

This PR improves the PEP8 compliance of interfaces/fsl and is a partial fix for Issue #597.

The initial PR includes the following:

File             Violations    Reduction   Remain
-------------------------------------------------
base.py          1             1   (100%)  0 
dti.py           162           162 (100%)  0
epi.py           18            18  (100%)  0
maths.py         36            34  (94%)   2
model.py         104           97  (93%)   7
preprocess.py    128           116 (91%)   12
utils.py         134           117 (87%)   17 

TOTALS --------- 583 --------- 545 (93%) - 38 ---

There are still some long docstring lines; wrapping them made CircleCI unhappy. Even with those outstanding, the readability of the code has been improved.

@coveralls
Copy link

Coverage Status

Coverage decreased (-2.6%) to 69.695% when pulling 152f461 on mgclark:pep8/fsl into da1f544 on nipy:master.

@oesteban
Copy link
Contributor

Hi @mgclark, I'm playing around with the docker images running tests in circleCI, that's why your tests are failing here. I'll try to find a solution for this ASAP

Sorry about that.

@mgclark
Copy link
Contributor Author

mgclark commented Aug 31, 2016

@oesteban No problem! Thanks!

@coveralls
Copy link

coveralls commented Aug 31, 2016

Coverage Status

Coverage increased (+0.006%) to 72.269% when pulling 2566e12 on mgclark:pep8/fsl into da1f544 on nipy:master.

@oesteban
Copy link
Contributor

oesteban commented Sep 6, 2016

Hi @mgclark, could you merge with current master? If you don't have the upstream set, you could do the following in your nipype's git root:

git remote add upstream https://github.com/nipy/nipype.git
git fetch upstream
git checkout pep8/fsl
git merge upstream/master

I don't think you will have any conflicts. If so you'll need to fix them, I will assist you with that. Once everything is merged and committed, you just need to do git push.

@mgclark
Copy link
Contributor Author

mgclark commented Sep 6, 2016

@oesteban No conflicts -- thanks!

@coveralls
Copy link

Coverage Status

Coverage remained the same at 72.261% when pulling 8366201 on mgclark:pep8/fsl into b05d153 on nipy:master.

3 similar comments
@coveralls
Copy link

Coverage Status

Coverage remained the same at 72.261% when pulling 8366201 on mgclark:pep8/fsl into b05d153 on nipy:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 72.261% when pulling 8366201 on mgclark:pep8/fsl into b05d153 on nipy:master.

@coveralls
Copy link

coveralls commented Sep 6, 2016

Coverage Status

Coverage remained the same at 72.261% when pulling 8366201 on mgclark:pep8/fsl into b05d153 on nipy:master.

@coveralls
Copy link

coveralls commented Sep 7, 2016

Coverage Status

Coverage remained the same at 72.269% when pulling 29311ae on mgclark:pep8/fsl into 99d191a on nipy:master.

@mgclark
Copy link
Contributor Author

mgclark commented Sep 8, 2016

Tests are passing -- this should be ready to go now.

@satra satra merged commit 1a9bef0 into nipy:master Sep 8, 2016
@mgclark mgclark deleted the pep8/fsl branch September 8, 2016 15:13
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.

4 participants