Skip to content

[MRG + 1] DOC improve check_memory related docstrings#9649

Merged
jnothman merged 1 commit intoscikit-learn:masterfrom
lesteve:improve-check-memory-et-al-docstrings
Aug 30, 2017
Merged

[MRG + 1] DOC improve check_memory related docstrings#9649
jnothman merged 1 commit intoscikit-learn:masterfrom
lesteve:improve-check-memory-et-al-docstrings

Conversation

@lesteve
Copy link
Copy Markdown
Member

@lesteve lesteve commented Aug 30, 2017

Following up on #9584 (comment).

Mostly removed joblib.Memory-like in the docstring type info and use this instead:

None, str or object with the joblib.Memory interface

ping @jnothman @glemaitre

@amueller amueller added this to the 0.19.1 milestone Aug 30, 2017
@amueller
Copy link
Copy Markdown
Member

circle failure?

@lesteve
Copy link
Copy Markdown
Member Author

lesteve commented Aug 30, 2017

Slight grrr, this is because I have enabled CircleCI on my fork and that I haven't got the recent CircleCI fix on master.

@lesteve lesteve force-pushed the improve-check-memory-et-al-docstrings branch from 02a9e75 to 8a0989e Compare August 30, 2017 15:46
@lesteve
Copy link
Copy Markdown
Member Author

lesteve commented Aug 30, 2017

I have retriggered the build, that should work fine now.

@amueller
Copy link
Copy Markdown
Member

LGTM

@amueller amueller changed the title [MRG] DOC improve check_memory related docstrings [MRG + 1] DOC improve check_memory related docstrings Aug 30, 2017
Copy link
Copy Markdown
Member

@jnothman jnothman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks

@jnothman jnothman merged commit 75b0448 into scikit-learn:master Aug 30, 2017
jnothman pushed a commit to jnothman/scikit-learn that referenced this pull request Aug 30, 2017
maskani-moh pushed a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017
jwjohnson314 pushed a commit to jwjohnson314/scikit-learn that referenced this pull request Dec 18, 2017
@lesteve lesteve deleted the improve-check-memory-et-al-docstrings branch March 31, 2023 09:40
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