-
-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Fixes #10501. python3 support and pep8 in jpl_units #10618
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
Conversation
@t20100 What would need to be done for these tests to be run by travis? |
Sorry - I don't understand. These aren't test cases, they're utilities to allow tests w/ units to be written. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is all fine. Theres nothing here but a bunch fo PEP8 fixes and a couple py3 things. Were these passing PEP8 before because there were suppressed errors? If so, should the test config file be edited?
Just a short feedback: I wanted to review this PR, but turned away because it's too much effort. It would be better for review to have the changes separated. There's a lot of whitespace change and hidden in between some functional and py3 changes. At least the github viewer does not really show the difference. Some larger whitespace changes are interpreted as completely new text, and I don't want to recheck everyone of them for a possible py3 or functional change. |
This is a special case. As soon as the merge conflict is resolved, I think we should go ahead and merge this. |
@timhoffm Have a look at then diff without (most) whitespace changes. @jklymak yes the exceptions should be removed from |
@QuLogic Thanks, I've learned something new. |
Sorry about that. I tried to update my local branch with a rebase and resolve the conflicts and somehow I ended up with a mess showing all the diffs from the original branch point. Let me know what's the best way to resolve this (deleting it and starting over is the only way I know to easily fix this) - my git merge/update skills are clearly lacking... |
Hah, I just did that yesterday too:
The trick to rebasing to master is to squash all your own commits first and then rebase onto master. Hope that helps - feel free to ask if any of the steps not clear... PS: its possible some of the changes on master were to files you are trying to modify. If thats the case things get a little more difficult... |
@jklymak Sorry - that didn't seem to work. There were changes on the same files - that's why there were conflicts in the first place. I tried what you suggested and it tells me the push was rejected it's behind the remote branch (I'm assuming this is because I pushed all those commits so they are already there). So... perhaps I should just close this and submit two different pull requests, one for the original cmp update and one to update the flake8 warnings. Sound ok? |
Well, try a force push first!
You can't break anything at this point 😉 |
There seem to be a conflict, please backport manually |
Does this still want to be backported to the |
Fix for #10501 - adds rich comparison methods to all classes for python3 support. Also updated all the code to be pep8/flake8 compliant (so the diff looks enormous because of indentation updates on virtually every line).
Tests cases that use jpl_units were run function normally.