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.

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

Flake8 in travis #402

Merged
merged 11 commits into from
Feb 7, 2016
Merged

Flake8 in travis #402

merged 11 commits into from
Feb 7, 2016

Conversation

bcipolli
Copy link
Contributor

@bcipolli bcipolli commented Feb 5, 2016

Review commit-by-commit is recommended...

Major changes include:

  • Spacing for math
  • Use not in / is not
  • Fix up multiline indenting

I also updated tox.ini, so my flake8 Sublime plugin returns meaningful errors on save. Yay!

Note the final commit (e86c0e9) makes an actual code change. Not sure if it's correct.

@effigies
Copy link
Member

effigies commented Feb 5, 2016

I think, generally, the idea is not to touch externals, since they're verbatim includes from other libraries. Style-cleaning them becomes a sort of pointless fork that has to be redone every time they're updated.

@bcipolli
Copy link
Contributor Author

bcipolli commented Feb 5, 2016

I think, generally, the idea is not to touch externals, since they're verbatim includes from other libraries. Style-cleaning them becomes a sort of pointless fork that has to be redone every time they're updated.

Right, I actually excluded them in tox.ini, but apparently touched them when running the automated commands. I'm working through things carefully myself now! Thanks!

@bcipolli
Copy link
Contributor Author

bcipolli commented Feb 6, 2016

Tests are passing, save for a few odd test failures in the bdist_wheel path. Any ideas?

Otherwise, just waiting for feedback on a single style change related to Recorder formatting, then I think we're ready to go!

image

@matthew-brett
Copy link
Member

That error might be a bug in a very recent version of wheel - could try retriggering build.

@matthew-brett
Copy link
Member

Or - better - upgrading wheel to latest before running bdist_wheel.

@bcipolli
Copy link
Contributor Author

bcipolli commented Feb 6, 2016

Cool, that seems to have done the trick. @effigies had one stylistic objection on the Recoders formatting... otherwise, good to go!

@effigies
Copy link
Member

effigies commented Feb 6, 2016

LGTM. Think that pointless line ought to be removed, but definitely not a big deal if that seems out-of-scope for the PR.

@effigies
Copy link
Member

effigies commented Feb 6, 2016

It seemed to me that separating flake8 from the regular tests might avoid duplicating work and make it clear from a quick glance whether there's a build or style issue. Take it or leave it, just a suggestion.

New commit: f77b94c
Tests: https://travis-ci.org/effigies/nibabel/builds/107459923

The Travis command is long and ugly. I don't fully understand how to expect conditionals to work, so there might be a cleaner way to do that.

@bcipolli
Copy link
Contributor Author

bcipolli commented Feb 6, 2016

👍 thanks!

@bcipolli
Copy link
Contributor Author

bcipolli commented Feb 6, 2016

Just cherry-picked the commit; if tests pass, I think we're good!

@effigies
Copy link
Member

effigies commented Feb 6, 2016

LGTM. @matthew-brett?

@bcipolli
Copy link
Contributor Author

bcipolli commented Feb 7, 2016

If there's any way we could merge this now, it'd be great--I'm working on a number of branches today, and being able to work on this (and have the PEP8 tests / new tox.ini) would be great. Much harder for me to wait and merge later.

Any small issues that come up, I can fix along the way...

@effigies
Copy link
Member

effigies commented Feb 7, 2016

Assuming my mandate to review your PRs is still in force, I'm going to go ahead and okay this one.

Thanks a lot.

effigies added a commit that referenced this pull request Feb 7, 2016
@effigies effigies merged commit d39626e into nipy:master Feb 7, 2016
@matthew-brett
Copy link
Member

Chris - thanks for merging this - I couldn't get to it until now, so it's good to keep up the momentum. You certainly do still have my warm approval for your mandate.

In general though - it's good to send out a warning you're going to do the merge, especially if someone has reviewed and not yet obviously signed off - something like - "I'm planning to merge this one soon / tomorrow - any more comments before I do". For something simple like this, half a day's warning is fine, unless there's some obvious unresolved controversy.

@effigies
Copy link
Member

effigies commented Feb 9, 2016

@matthew-brett Sounds good.

grlee77 pushed a commit to grlee77/nibabel that referenced this pull request Mar 15, 2016
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.

3 participants