Skip to content

[TST] Improve py.test configuration of doctests #2802

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 1 commit into from
Nov 28, 2018

Conversation

oesteban
Copy link
Contributor

@oesteban oesteban commented Nov 26, 2018

This PR ensures that doctests are run OUTSIDE nipype's source directory
in all the cases. Previously, doctests would chdir into the testing/data
folder and some interfaces would generate results.

Also, deletes nipype/testing/data/slice_timing.1D, which seems to
have sneaked into the tree for these very reasons in some past PR.

This can be held out until next release after 1.1.6.

Summary

Fixes # .

List of changes proposed in this PR (pull-request)

Acknowledgment

  • (Mandatory) I acknowledge that this contribution will be available under the Apache 2 license.

This PR ensures that doctests are run OUTSIDE nipype's source directory
in all the cases. Previously, doctests would chdir into the testing/data
folder and some interfaces would generate results.

Also, deletes ``nipype/testing/data/slice_timing.1D``, which seems to
have seaked into the tree for these very reasons in some past PR.
@oesteban oesteban requested a review from djarecka November 26, 2018 18:50
@effigies effigies added this to the 1.1.7 milestone Nov 26, 2018
@codecov-io
Copy link

codecov-io commented Nov 26, 2018

Codecov Report

Merging #2802 into master will decrease coverage by 3.38%.
The diff coverage is 88.88%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2802      +/-   ##
==========================================
- Coverage   67.51%   64.12%   -3.39%     
==========================================
  Files         341      339       -2     
  Lines       43297    43258      -39     
  Branches     5369     5366       -3     
==========================================
- Hits        29230    27740    -1490     
- Misses      13366    14451    +1085     
- Partials      701     1067     +366
Flag Coverage Δ
#smoketests ?
#unittests 64.12% <88.88%> (-0.8%) ⬇️
Impacted Files Coverage Δ
nipype/interfaces/ants/registration.py 74.22% <ø> (ø) ⬆️
nipype/interfaces/bru2nii.py 70% <ø> (ø) ⬆️
nipype/pipeline/plugins/lsf.py 17.33% <0%> (ø) ⬆️
nipype/conftest.py 95.65% <94.11%> (-4.35%) ⬇️
nipype/interfaces/nilearn.py 40% <0%> (-56.67%) ⬇️
nipype/utils/spm_docs.py 25.92% <0%> (-44.45%) ⬇️
nipype/interfaces/freesurfer/base.py 50% <0%> (-30.51%) ⬇️
nipype/utils/logger.py 59.7% <0%> (-29.86%) ⬇️
nipype/algorithms/rapidart.py 35.39% <0%> (-29.21%) ⬇️
nipype/interfaces/spm/base.py 58.41% <0%> (-29.05%) ⬇️
... and 45 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b448b60...beacb0a. Read the comment docs.

@oesteban
Copy link
Contributor Author

Tests are passing and coverage decreased because the #smoketests target was not received by codecov. I've checked and both travis and circle are giving exactly the same number of tests (passed, xfailed, skipped) before and after these changes. Merge?

@satra satra merged commit b7f5cdd into nipy:master Nov 28, 2018
@oesteban oesteban deleted the maint/tests-on-temp branch November 28, 2018 06:10
yarikoptic added a commit to yarikoptic/nipype that referenced this pull request Jan 11, 2019
1.1.7 (December 17, 2018)

* FIX: Copy node list before generating a flat graph (nipy#2828)
* FIX: Update pytest req'd version to 3.6 (nipy#2827)
* FIX: Set ResourceMonitor.fname to an absolute path (nipy#2824)
* FIX: Order of SPM.NewSegment channel_info boolean tuple is (Field, Corrected) (nipy#2817)
* FIX: Indices were swapped for memory and cpu profile data (nipy#2816)
* FIX: ``status_callback`` not called with ``stop_on_first_crash`` (nipy#2810)
* FIX: Change undefined ScriptError on LFS plugin to IOError (nipy#2803)
* ENH: Add NaN failure mode to CompCor interfaces (nipy#2819)
* ENH: Enable cnr_maps and residuals outputs for FSL eddy (nipy#2750)
* ENH: Improve ``str2bool`` + doctests (nipy#2807)
* TST: Improve py.test configuration of doctests (nipy#2802)
* DOC: Update DOI badge to point to all versions (nipy#2804)
* MAINT: Offload interfaces with help formatting (nipy#2797)
* MAINT: Reduce minimal code redundancy in filemanip.get_dependencies (nipy#2782)
* MAINT: Delayed imports to reduce import time (nipy#2809)
...
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