Skip to content

[MRG] CI Reinstate docstring testing#10473

Merged
glemaitre merged 5 commits intoscikit-learn:masterfrom
jnothman:test-docstrings
Feb 10, 2018
Merged

[MRG] CI Reinstate docstring testing#10473
glemaitre merged 5 commits intoscikit-learn:masterfrom
jnothman:test-docstrings

Conversation

@jnothman
Copy link
Copy Markdown
Member

Apparently this went missing in #9840

Apparently this went missing in scikit-learn#9840
@lesteve
Copy link
Copy Markdown
Member

lesteve commented Jan 15, 2018

Good catch, Travis error seems like a genuine one.

@jnothman
Copy link
Copy Markdown
Member Author

I don't understand how the tests for deprecation and delegation ever worked... They don't make much sense anyway, because they test on an instance rather than a class.

@glemaitre
Copy link
Copy Markdown
Member

Uhm that seems quite important ;) @jnothman could you have time to solve the conflicts

@jnothman
Copy link
Copy Markdown
Member Author

jnothman commented Feb 8, 2018

@glemaitre are you +1 for merge?

@jnothman jnothman closed this Feb 10, 2018
@jnothman jnothman reopened this Feb 10, 2018
@jnothman
Copy link
Copy Markdown
Member Author

Sorry, misplaced click. Merge, @glemaitre?

@glemaitre
Copy link
Copy Markdown
Member

glemaitre commented Feb 10, 2018 via email

@glemaitre glemaitre merged commit 116c96c into scikit-learn:master Feb 10, 2018
@glemaitre
Copy link
Copy Markdown
Member

Found a computer back. Thanks @jnothman

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants