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

Fix to sklearn imports. #3773

Merged
merged 6 commits into from
Nov 18, 2016
Merged

Fix to sklearn imports. #3773

merged 6 commits into from
Nov 18, 2016

Conversation

jaeilepp
Copy link
Contributor

@jaeilepp jaeilepp commented Nov 17, 2016

I think there is something wrong with how sklearn handles deprecations. I couldn't find a better way to make it work on every platform.

EDIT: In the end, I think my setup was somehow wrong. Now it is cleaner than in the beginning.

@agramfort
Copy link
Member

thanks a lot @jaeilepp

let us know when travis is happy

@coveralls
Copy link

coveralls commented Nov 17, 2016

Coverage Status

Coverage decreased (-0.01%) to 90.708% when pulling 2bf966f on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

@agramfort
Copy link
Member

travis complains

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.2%) to 90.547% when pulling 5e30920 on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

@jaeilepp
Copy link
Contributor Author

I'm not sure how we fixed the flake errors we get here. @Eric89GXL any idea?

@larsoner
Copy link
Member

That shouldn't really happen because setup.cfg has been set up in latest master to ignore 305. Try rebasing

@larsoner
Copy link
Member

Oh, maint/0.12. You need to add to setup.cfg, might as well do it here

@larsoner
Copy link
Member

...but we should be careful when merging this, it is going to overwrite our stable docs.

@jaeilepp
Copy link
Contributor Author

I actually disabled the update of docs in an earlier push https://github.com/mne-tools/mne-python/blob/maint/0.12/circle.yml.

@jaeilepp
Copy link
Contributor Author

Seems that the warnings for str.format are also disabled. Maybe the format fixes should be done on master too. My understanding is that '{}'.format('smth') does not work on python 3.0. Not sure if anyone is using it...

@larsoner
Copy link
Member

That works fine on Py3k, but doesn't work on 2.6. Maybe that's what you're thinking of? In which case it's fine because we have dropped support for 2.6

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 90.728% when pulling fec4326 on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

@coveralls
Copy link

coveralls commented Nov 17, 2016

Coverage Status

Coverage increased (+0.02%) to 90.735% when pulling fec4326 on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

@larsoner
Copy link
Member

https://travis-ci.org/mne-tools/mne-python/jobs/176711910#L2748

We need to change the decorator to except Exception instead of except ImportError

@coveralls
Copy link

coveralls commented Nov 18, 2016

Coverage Status

Coverage increased (+0.01%) to 90.728% when pulling c000f9b on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 90.848% when pulling e4c1c6a on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage increased (+0.1%) to 90.848% when pulling e4c1c6a on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

@coveralls
Copy link

coveralls commented Nov 18, 2016

Coverage Status

Coverage increased (+0.1%) to 90.851% when pulling e4c1c6a on jaeilepp:maint/0.12 into 1eeddd3 on mne-tools:maint/0.12.

@jaeilepp
Copy link
Contributor Author

Travis now passes. I don't understand the problem with appveyor.

@agramfort
Copy link
Member

ok that's good enough for me

thx @jaeilepp

@agramfort agramfort merged commit 952de45 into mne-tools:maint/0.12 Nov 18, 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.

None yet

4 participants