Skip to content
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.

Sign up for GitHub

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

Jump to bottom

FIX: Repair aftermath of docs refactor #3133

Merged
merged 3 commits into from
Jan 2, 2020
Merged

FIX: Repair aftermath of docs refactor #3133

merged 3 commits into from
Jan 2, 2020

Conversation

oesteban
Copy link
Contributor

@oesteban oesteban commented Jan 2, 2020 •
edited
Loading

  • Removes the build_docs step in test_pytest, as we now have a pure-python job for it.
  • Fixes matlab code generation within spm.EstimateConstrast. Stylistic edits ended up introducing raw strings with uninterpreted backslashes (e.g., \n).
  • Run black

@oesteban
FIX: Repair aftermath of docs refactor
3b14b1d 
Bringing CircleCI back to green after nipy#3124, nipy#3131, and nipy#3132.
@oesteban
fix: revise some r-strings in SPM's EstimateContrast
4ff3a51 
By removing some space concatenation of strings, some of them were
r-strings and the concatenated one contained ``\n``, effectively
escaping the special return-carriage.

Instead of concatenating strings, the interface now accumulates the
lines in a list that is joined in the end.
@oesteban oesteban force-pushed the fix/3124-aftermath branch 2 times, most recently from 9eb3320 to ee4f983 Compare January 2, 2020 20:48
@codecov
Copy link

codecov bot commented Jan 2, 2020 •
edited
Loading

Codecov Report

Merging #3133 into master will decrease coverage by 0.83%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3133      +/-   ##
==========================================
- Coverage    64.8%   63.96%   -0.84%     
==========================================
  Files         299      297       -2     
  Lines       39489    39399      -90     
  Branches     5220     5210      -10     
==========================================
- Hits        25590    25202     -388     
- Misses      12844    13154     +310     
+ Partials     1055     1043      -12
Flag Coverage Δ
#unittests 63.96% <0%> (-0.84%) ⬇️
Impacted Files Coverage Δ
nipype/interfaces/camino/dti.py 77.84% <ø> (ø) ⬆️
nipype/sphinxext/apidoc/__init__.py 28.2% <ø> (ø) ⬆️
nipype/algorithms/icc.py 57.53% <ø> (ø) ⬆️
nipype/interfaces/spm/model.py 43.2% <0%> (+0.93%) ⬆️
nipype/interfaces/afni/base.py 67.22% <0%> (ø) ⬆️
nipype/interfaces/afni/preprocess.py 82.02% <0%> (ø) ⬆️
nipype/interfaces/nilearn.py 38.98% <0%> (-57.63%) ⬇️
nipype/utils/spm_docs.py 20% <0%> (-48%) ⬇️
nipype/interfaces/freesurfer/base.py 45.68% <0%> (-30.18%) ⬇️
nipype/utils/logger.py 58.46% <0%> (-27.7%) ⬇️
... and 18 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 75a66b9...b1eccaf. Read the comment docs.

@oesteban oesteban force-pushed the fix/3124-aftermath branch from ee4f983 to b1eccaf Compare January 2, 2020 20:49
@oesteban
Copy link
Contributor Author

oesteban commented Jan 2, 2020

After merging this one, only #3134 is left to bring everything back.

@oesteban oesteban merged commit 23c9ace into nipy:master Jan 2, 2020
@oesteban oesteban deleted the fix/3124-aftermath branch January 2, 2020 22:06
@effigies effigies added this to the 1.4.1 milestone Jan 6, 2020
@effigies effigies mentioned this pull request Jan 6, 2020
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.4.1
Development

Successfully merging this pull request may close these issues.
2 participants
@oesteban @effigies