Skip to content

[MRG+2] MAINT merge _check_cv into check_cv as indices argument is removed in 0.17 #4829

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 1 commit into from
Jun 8, 2015

Conversation

raghavrv
Copy link
Member

@raghavrv raghavrv commented Jun 7, 2015

@vene
Copy link
Member

vene commented Jun 7, 2015

Seems straightforward. LGTM

@vene vene changed the title MAINT merge _check_cv into check_cv as indices argument is removed in 0.17 [MRG+1] MAINT merge _check_cv into check_cv as indices argument is removed in 0.17 Jun 7, 2015
@jnothman
Copy link
Member

jnothman commented Jun 8, 2015

Please rebase, but otherwise LGTM.

@jnothman jnothman changed the title [MRG+1] MAINT merge _check_cv into check_cv as indices argument is removed in 0.17 [MRG+2] MAINT merge _check_cv into check_cv as indices argument is removed in 0.17 Jun 8, 2015
@raghavrv raghavrv force-pushed the remove_deprecated_check_cv branch from 887aebd to 62325cb Compare June 8, 2015 11:07
@raghavrv
Copy link
Member Author

raghavrv commented Jun 8, 2015

@jnothman done!

(Slightly unrelated) There seems to have been a change in the grid_search module... Is there a way for me to automatically track all such changes and incorporate into model_selection as and when they come? (w.r.t. #4294 )

@raghavrv
Copy link
Member Author

raghavrv commented Jun 8, 2015

I started "watching" scikit-learn and will check for any such changes to g_s, c_v or l_c modules that gets merged as often as I can and incorporate those into model_selection too... but am a little paranoid about missing a few changes...

@raghavrv
Copy link
Member Author

raghavrv commented Jun 8, 2015

Sorry for the stupid question! Simply checking the history of the file would suffice! :)

@jnothman
Copy link
Member

jnothman commented Jun 8, 2015

I don't know of a way to track changes to a file as such, but the following
should help:

git log model_selection..master sklearn/grid_search.py sklearn/pipeline.py
sklearn/learning_curve.py

(make sure you pull first!)

On 8 June 2015 at 21:12, Raghav R V notifications@github.com wrote:

@jnothman https://github.com/jnothman done!

(Slightly unrelated) There seems to have been a change in the grid_search
module... Is there a way for me to automatically track all such changes and
incorporate into model_selection as and when they come? (w.r.t. #4294
#4294 )


Reply to this email directly or view it on GitHub
#4829 (comment)
.

@raghavrv
Copy link
Member Author

raghavrv commented Jun 8, 2015

Thanks :)

@jnothman
Copy link
Member

jnothman commented Jun 8, 2015

If you'd rather a daily report, you could stick

git log master@{yesterday}..master sklearn/grid_search.py
sklearn/pipeline.py sklearn/learning_curve.py

in a cron job (and if properly set up it'll email any output to you)!

On 8 June 2015 at 21:28, Raghav R V notifications@github.com wrote:

Sorry for the stupid question! Simply checking the history of the file
would suffice! :)


Reply to this email directly or view it on GitHub
#4829 (comment)
.

@jnothman
Copy link
Member

jnothman commented Jun 8, 2015

see also https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection

On 8 June 2015 at 21:32, Raghav R V notifications@github.com wrote:

Thanks :)


Reply to this email directly or view it on GitHub
#4829 (comment)
.

@agramfort
Copy link
Member

+1 for merge when rebased.

@raghavrv
Copy link
Member Author

raghavrv commented Jun 8, 2015

@jnothman This @yesterday is quite cool! I'll set up a cron job to send me a mail! Thanks a lot! ;)

@agramfort Have rebased :)

agramfort added a commit that referenced this pull request Jun 8, 2015
[MRG+2] MAINT merge _check_cv into check_cv as indices argument is removed in 0.17
@agramfort agramfort merged commit d1d95e8 into scikit-learn:master Jun 8, 2015
@agramfort
Copy link
Member

thanks @rvraghav93

@raghavrv
Copy link
Member Author

raghavrv commented Jun 8, 2015

Thanks for the reviews :)

@jnothman
Copy link
Member

jnothman commented Jun 8, 2015

I actually think checking the list of changes immediately before a rebase, using git log model_selection..master sklearn/grid_search.py sklearn/pipeline.py sklearn/learning_curve.py is probably more appropriate -- as long as you remember to do it before a rebase!

@raghavrv
Copy link
Member Author

raghavrv commented Jun 8, 2015

yes! I saved the above as an alias chkms! Thanks :)

@jnothman
Copy link
Member

jnothman commented Jun 9, 2015

[

sorry, I wrote pipeline instead of cross_validation above.

Also you can search for commits whose diffs introduce or remove an instance
of a word, e.g. git log b..master -S cross_validation. Or regex in diffs:
git log b..master -G '\b(cross_validation|grid_search)\b'

]

On 9 June 2015 at 08:11, Raghav R V notifications@github.com wrote:

yes! I saved the above as an alias chkms! Thanks :)


Reply to this email directly or view it on GitHub
#4829 (comment)
.

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