Skip to content

MRG: fix Python 2, old Sympy stuff in derivations #911

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 3 commits into from
May 25, 2020

Conversation

matthew-brett
Copy link
Member

Python 2 prints, and older uses of Sympy.

Found while checking #910

@codecov
Copy link

codecov bot commented May 16, 2020

Codecov Report

Merging #911 into master will decrease coverage by 0.08%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #911      +/-   ##
==========================================
- Coverage   91.81%   91.73%   -0.09%     
==========================================
  Files          97       97              
  Lines       12359    12359              
  Branches     2177     2177              
==========================================
- Hits        11348    11337      -11     
- Misses        678      684       +6     
- Partials      333      338       +5     
Impacted Files Coverage Δ
nibabel/environment.py 75.00% <0.00%> (-20.00%) ⬇️
nibabel/casting.py 85.28% <0.00%> (-0.87%) ⬇️
nibabel/dft.py 80.36% <0.00%> (-0.62%) ⬇️
nibabel/nifti1.py 91.66% <0.00%> (-0.31%) ⬇️
nibabel/volumeutils.py 83.94% <0.00%> (-0.20%) ⬇️

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 7bc31e5...daef80a. Read the comment docs.

@jond01
Copy link
Contributor

jond01 commented May 18, 2020

Hi, I suggest also changing slice_thickness and its occurrences here:

slice_thickness = Symbol('\Delta{s}')

To slice_spacing, in order to avoid confusion with the Slice Thickness dicom attribute.

@matthew-brett
Copy link
Member Author

Good point, thanks.

@pep8speaks
Copy link

pep8speaks commented May 18, 2020

Hello @matthew-brett, Thank you for updating!

Line 56:9: E231 missing whitespace after ','
Line 61:10: E231 missing whitespace after ','
Line 72:1: E305 expected 2 blank lines after class or function definition, found 1
Line 77:9: E231 missing whitespace after ','
Line 77:33: E231 missing whitespace after ','
Line 77:35: E231 missing whitespace after ','
Line 143:1: E305 expected 2 blank lines after class or function definition, found 1

To test for issues locally, pip install flake8 and then run flake8 nibabel.

Comment last updated at 2020-05-25 09:32:47 UTC

@effigies
Copy link
Member

The failing style check should be fixed in master. Mind hitting the PEP8 fixes requested by pep8speaks?

@matthew-brett
Copy link
Member Author

I did a rebase to get rid of the PEP8 errors - but now get a coverage error - it must be a false positive.

@effigies
Copy link
Member

Yeah, Codecov is overly sensitive. I'm okay to merge, if you're all set.

@matthew-brett
Copy link
Member Author

All set.

@effigies effigies merged commit 3d692e3 into nipy:master May 25, 2020
@matthew-brett matthew-brett deleted the master branch May 25, 2020 19:36
@effigies effigies added this to the 3.2.0 milestone Aug 16, 2020
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