fixing tests and install errors #1866
Conversation
satra
commented
Mar 7, 2017
satra
commented
- removing unnecessary autotests
- adding brukerdir to installer
|
closes #1866 @milesseidel - if you would like to test this yourself, you can try installing my branch while this pull request goes through review.
|
| from ..confounds import CompCor | ||
|
|
||
|
|
||
| def test_CompCor_inputs(): |
There was a problem hiding this comment.
why these need to go away? We are continuously adding and removing them...
There was a problem hiding this comment.
because autotests are only added for an interface if a named test doesn't exist. and we have test_compcor.py
There was a problem hiding this comment.
@satra Thanks!
$ pip install --upgrade https://github.com/satra/nipype/archive/fix/bru2.zip
$ python -c "import nipype; nipype.test()"
...
===== 585 passed, 1 skipped in 22.58 seconds ====
Codecov Report
@@ Coverage Diff @@
## master #1866 +/- ##
==========================================
- Coverage 73.13% 73.11% -0.03%
==========================================
Files 1065 1061 -4
Lines 53429 53373 -56
==========================================
- Hits 39075 39023 -52
+ Misses 14354 14350 -4
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #1866 +/- ##
==========================================
- Coverage 73.13% 73.11% -0.03%
==========================================
Files 1065 1061 -4
Lines 53429 53367 -62
==========================================
- Hits 39075 39017 -58
+ Misses 14354 14350 -4
Continue to review full report at Codecov.
|
| @@ -130,7 +133,7 @@ def main(): | |||
| install_requires=ldict['REQUIRES'], | |||
| setup_requires=['future', 'configparser'], | |||
| provides=ldict['PROVIDES'], | |||
| packages=find_packages(exclude=['*.tests']), | |||
| packages=find_packages(), | |||
There was a problem hiding this comment.
@oesteban, @chrisfilo - any idea why the tests directories were removed from setup? i'm putting them back in.
There was a problem hiding this comment.
It is a bit blurry in my memory now, but I think this was added to avoid tests to be run from the installed version of nipype and make sure they run from the source I guess py.test takes care of this, so it should be fine re-adding them.
| @@ -1,9 +1,9 @@ | |||
| # AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT | |||
| from __future__ import unicode_literals | |||
| from ..preprocess import ApplyXfm | |||
| from ..preprocess import ApplyXFM | |||
There was a problem hiding this comment.
nipype/interfaces/fsl/tests/test_auto_ApplyXFM.py already exists. Should this file just be removed?
There was a problem hiding this comment.
i think this PR has taken care of it. the issue is with OSX and case-insensitive installations, which gave rise to the same named file with different content. the older interface which was deprecated in 0.12.1 has now been removed, so we should be ok.
