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

Skip to content

[MRG+1] Add dependence on max_features to docstring #4042

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

Merged
merged 2 commits into from
Jan 9, 2015

Conversation

lmichelbacher
Copy link
Contributor

As requested in #4032 (comment).

As requested in 4032#issuecomment-68478422.
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling de72e1d on lmichelbacher:patch-2 into d5c72f3 on scikit-learn:master.

Terms that were ignored because they either
- occurred in too many documents (`max_df`)
- occurred in too few documents (`min_df`)
- were cut off by feature selection (`max_features`).
Copy link
Member

Choose a reason for hiding this comment

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

Do the bullets render fine in the sphinx generated doc?

Copy link
Member

Choose a reason for hiding this comment

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

@agramfort I think it doesn't render properly...

Ref : From scipy's documentation... A similar bulleted list in the documentation was changed to this and later to this...

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

I don't think you need to prefix it with spaces, but may need a blank line before the list.

Copy link
Member

Choose a reason for hiding this comment

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

@lmichelbacher please run:

pip install -U sphinx
cd doc
make html-noplot

and then check the rendered documentation in the doc/_build/ folder.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ogrisel Thanks for the tip.

I've checked out the patch-2 branch on lmichelbacher/scikit-learn and ran the commands. The Python source file (text.py) does have the modified docstring but for some reason the built docs don't reflect that.

I'm not familiar with sphinx so it might be some noob mistake.

Copy link
Member

Choose a reason for hiding this comment

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

You need to make sure that the development version of scikit-learn is the one used when building the doc. To do so, you can run python setup.py develop in your source folder. Once the doc is build you can uninstall and reinstall the latest stable version of scikit-learn if you prefer not to use the development version otherwise.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, that worked.

I've copied the structure of the docstring from the example above but in my case the line above the bullets is rendered in bold. As soon as I've figured out how to fix this I'll amend the commit.

Copy link
Member

Choose a reason for hiding this comment

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

I think you need a newline before the bullets.

@lmichelbacher
Copy link
Contributor Author

Is there any way to change the email on the last commit? My user.email/user.name wasn't set up correctly.

@jnothman
Copy link
Member

jnothman commented Jan 8, 2015

git commit --amend --reset-author
git push -f branchspec

@lmichelbacher
Copy link
Contributor Author

@jnothman does this work even for commits that have already been pushed?

@jnothman
Copy link
Member

jnothman commented Jan 8, 2015

The --amend locally changes your commit (really, creates a new one and resets your local HEAD). The -f forces passing that change to the remote HEAD, so yes.

@lmichelbacher
Copy link
Contributor Author

New** git magic, cool. I'll do that.

** new to me ;)

Without the extra line, the headline is rendered in bold.
@amueller
Copy link
Member

amueller commented Jan 8, 2015

LGTM 👍

@GaelVaroquaux GaelVaroquaux changed the title Add dependence on max_features to docstring [MRG+1] Add dependence on max_features to docstring Jan 9, 2015
@GaelVaroquaux
Copy link
Member

LGTM. Merging. Thanks!

GaelVaroquaux added a commit that referenced this pull request Jan 9, 2015
 [MRG+1] Add dependence on max_features to docstring
@GaelVaroquaux GaelVaroquaux merged commit 69567ec into scikit-learn:master Jan 9, 2015
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.

8 participants