Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[MRG] backport 0.18 release date and py2.6 deprecation warning to 0.18.X branch #7580

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

Closed
wants to merge 2 commits into from

Conversation

sietse
Copy link

@sietse sietse commented Oct 5, 2016

This pull request backports two documentation changesets from the master branch:

If this PR is requested, @NelleV can remove #7518 from the list of PRs that need backporting. (See #7518 (comment).)

@jnothman
Copy link
Member

jnothman commented Oct 5, 2016

LGTM, assuming this is the best way to backport fixes.

@sietse sietse changed the title [MRG] backport 0.18 release date and py2.6 deprecation warning to 0.18.X branch backport 0.18 release date and py2.6 deprecation warning to 0.18.X branch Oct 5, 2016
@lesteve
Copy link
Member

lesteve commented Oct 5, 2016

You would very likely need to backport recent changes of flake8_diff.sh to get rid of the Travis flake8 error.

@sietse
Copy link
Author

sietse commented Oct 5, 2016

The Travis CI build fails because of some flake8 problems in sklearn/decomposition/online_lda.py that were introduced in 9b56104. That commit is not an ancestor of 0.18.X, so I don't know why it is causing this PR to fail its tests. Should I re-add the [MRG] tag?

Edit: ah, crossed messages with @lesteve.

@lesteve
Copy link
Member

lesteve commented Oct 5, 2016

I think you are safe ignoring the flake8 error for now.If we really care, we should backport #7575 into 0.18.X.

@sietse sietse changed the title backport 0.18 release date and py2.6 deprecation warning to 0.18.X branch [MRG] backport 0.18 release date and py2.6 deprecation warning to 0.18.X branch Oct 5, 2016
@sietse
Copy link
Author

sietse commented Oct 5, 2016

FWIW, I ran cd doc; make locally before pushing, and that completed without errors.

@amueller
Copy link
Member

amueller commented Oct 5, 2016

Damn it. I fixed this like a week ago but pushed to origin and not upstream :(

@amueller
Copy link
Member

amueller commented Oct 5, 2016

Sorry for duplicate work.

@sietse
Copy link
Author

sietse commented Oct 5, 2016

No problem. I see you pushed the 2.6 warning to master, but don't see the note that 0.18 was released September 28, is that possible? If so, you can merge #7583, or fix it yourself and close #7583.

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