Skip to content

[MRG + 1] More versionadded everywhere!#7403

Merged
amueller merged 2 commits intoscikit-learn:masterfrom
amueller:versionadded_rebase
Sep 27, 2016
Merged

[MRG + 1] More versionadded everywhere!#7403
amueller merged 2 commits intoscikit-learn:masterfrom
amueller:versionadded_rebase

Conversation

@amueller
Copy link
Copy Markdown
Member

@amueller amueller commented Sep 12, 2016

This is a rebase of #5856.

I'm not entirely sure if this is the right thing to do in all cases. Opinions @ogrisel @jnothman ?

jnothman
jnothman reviewed Sep 13, 2016
View reviewed changes
sklearn/model_selection/_split.py Outdated
GroupKFold: K-fold iterator variant with non-overlapping groups.

.. versionchanged:: 0.18
Moved from sklearn.cross_validation.
Copy link
Copy Markdown
Member

@jnothman jnothman Sep 13, 2016

Choose a reason for hiding this comment

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

No. The interface is too different to just say this is a move.

@jnothman
Copy link
Copy Markdown
Member

jnothman commented Sep 13, 2016

IMO the point of these things is that if someone wants to make code that is portable back to scikit-learn 0.17, they should have guidance in the docstring which features were available. Hence "moved" on CV splitters is unhelpful; they're not backwards compatible. Annotation of private functions is also unhelpful.

@amueller amueller force-pushed the versionadded_rebase branch 2 times, most recently from d90661f to 5698cea Compare September 13, 2016 20:41
@amueller
Copy link
Copy Markdown
Member Author

amueller commented Sep 13, 2016

better?

ogrisel
ogrisel reviewed Sep 13, 2016
View reviewed changes
sklearn/ensemble/forest.py Outdated
The columns from indicator[n_nodes_ptr[i]:n_nodes_ptr[i+1]]
gives the indicator value for the i-th estimator.

.. versionadded:: 0.18
Copy link
Copy Markdown
Member

@ogrisel ogrisel Sep 13, 2016

Choose a reason for hiding this comment

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

This should be before the Parameters section, no?

Copy link
Copy Markdown
Member Author

@amueller amueller Sep 13, 2016

Choose a reason for hiding this comment

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

Probably, yeah :-/

@ogrisel
Copy link
Copy Markdown
Member

ogrisel commented Sep 13, 2016

LGTM, +1 for merge. Thanks very much @amueller.

@amueller
Copy link
Copy Markdown
Member Author

amueller commented Sep 13, 2016

the legwork was done by @welch :)

@amueller amueller changed the title More versionadded everywhere! [MRG + 1] More versionadded everywhere! Sep 13, 2016
@welch
Copy link
Copy Markdown
Contributor

welch commented Sep 13, 2016

my very first hack day PR. thanks!

@jnothman
Copy link
Copy Markdown
Member

jnothman commented Sep 14, 2016

I don't think I realised those max_n_classes params in metrics.cluster.supervised were added since 0.17.1. Can we uhh... not release them?

@ogrisel
Copy link
Copy Markdown
Member

ogrisel commented Sep 14, 2016

What's the issue with max_n_classes?

@ogrisel
Copy link
Copy Markdown
Member

ogrisel commented Sep 14, 2016

I found it: #5445 (comment)

Reading about it.

@amueller
Copy link
Copy Markdown
Member Author

amueller commented Sep 14, 2016

+10 for not releasing them ;)
@welch sorry for the slow turn-around.... I was a bit busy this last... err ... year?

@jnothman
Copy link
Copy Markdown
Member

jnothman commented Sep 14, 2016

Needs rebase

@amueller
Copy link
Copy Markdown
Member Author

amueller commented Sep 27, 2016

rebase done.

@amueller amueller merged commit 60a1356 into scikit-learn:master Sep 27, 2016
amueller added a commit that referenced this pull request Sep 27, 2016
@amueller
[MRG + 1] More versionadded everywhere! (#7403)
38030a0 
* insert versionadded versionchanged directives in docstrings for 0.18

indicate where exception classes were moved from

* moved versionadded in the proper places
TomDLT pushed a commit to TomDLT/scikit-learn that referenced this pull request Oct 3, 2016
@amueller @TomDLT
[MRG + 1] More versionadded everywhere! (scikit-learn#7403)
6ca823d 
* insert versionadded versionchanged directives in docstrings for 0.18

indicate where exception classes were moved from

* moved versionadded in the proper places
@amueller amueller mentioned this pull request Oct 25, 2016
Closed
yarikoptic added a commit to yarikoptic/scikit-learn that referenced this pull request Nov 10, 2016
@yarikoptic
Merge tag '0.18' into releases
ef8fa61 
* tag '0.18': (1286 commits)
  [MRG + 1] More versionadded everywhere! (scikit-learn#7403)
  minor doc fixes
  fix lbfgs rename (scikit-learn#7503)
  minor fixes to whatsnew
  fix scoring function table
  fix rebase messup
  DOC more what's new subdivision
  DOC Attempt to impose some order on What's New 0.18
  no fixed width within bold
  REL changes for release in 0.18.X branch (scikit-learn#7414)
  [MRG+2] Timing and training score in GridSearchCV (scikit-learn#7325)
  DOC: Added Nested Cross Validation Example (scikit-learn#7111)
  Sync docstring and definition default argument in kneighbors (scikit-learn#7476)
  added contributors for 0.18, minor formatting fixes.
  Fix typo in whats_new.rst
  [MRG+2] FIX adaboost estimators not randomising correctly (scikit-learn#7411)
  Addressing issue scikit-learn#7468. (scikit-learn#7472)
  Reorganize README
  clean up deprecation warning stuff in common tests
  [MRG+1] Fix regression in silhouette_score for clusters of size 1 (scikit-learn#7438)
  ...
yarikoptic added a commit to yarikoptic/scikit-learn that referenced this pull request Nov 10, 2016
@yarikoptic
Merge branch 'releases' into dfsg
e78c6e6 
* releases: (1286 commits)
  [MRG + 1] More versionadded everywhere! (scikit-learn#7403)
  minor doc fixes
  fix lbfgs rename (scikit-learn#7503)
  minor fixes to whatsnew
  fix scoring function table
  fix rebase messup
  DOC more what's new subdivision
  DOC Attempt to impose some order on What's New 0.18
  no fixed width within bold
  REL changes for release in 0.18.X branch (scikit-learn#7414)
  [MRG+2] Timing and training score in GridSearchCV (scikit-learn#7325)
  DOC: Added Nested Cross Validation Example (scikit-learn#7111)
  Sync docstring and definition default argument in kneighbors (scikit-learn#7476)
  added contributors for 0.18, minor formatting fixes.
  Fix typo in whats_new.rst
  [MRG+2] FIX adaboost estimators not randomising correctly (scikit-learn#7411)
  Addressing issue scikit-learn#7468. (scikit-learn#7472)
  Reorganize README
  clean up deprecation warning stuff in common tests
  [MRG+1] Fix regression in silhouette_score for clusters of size 1 (scikit-learn#7438)
  ...
yarikoptic added a commit to yarikoptic/scikit-learn that referenced this pull request Nov 10, 2016
@yarikoptic
Merge branch 'dfsg' into debian
e804609 
* dfsg: (1286 commits)
  [MRG + 1] More versionadded everywhere! (scikit-learn#7403)
  minor doc fixes
  fix lbfgs rename (scikit-learn#7503)
  minor fixes to whatsnew
  fix scoring function table
  fix rebase messup
  DOC more what's new subdivision
  DOC Attempt to impose some order on What's New 0.18
  no fixed width within bold
  REL changes for release in 0.18.X branch (scikit-learn#7414)
  [MRG+2] Timing and training score in GridSearchCV (scikit-learn#7325)
  DOC: Added Nested Cross Validation Example (scikit-learn#7111)
  Sync docstring and definition default argument in kneighbors (scikit-learn#7476)
  added contributors for 0.18, minor formatting fixes.
  Fix typo in whats_new.rst
  [MRG+2] FIX adaboost estimators not randomising correctly (scikit-learn#7411)
  Addressing issue scikit-learn#7468. (scikit-learn#7472)
  Reorganize README
  clean up deprecation warning stuff in common tests
  [MRG+1] Fix regression in silhouette_score for clusters of size 1 (scikit-learn#7438)
  ...
Sundrique pushed a commit to Sundrique/scikit-learn that referenced this pull request Jun 14, 2017
@amueller @Sundrique
[MRG + 1] More versionadded everywhere! (scikit-learn#7403)
0550133 
* insert versionadded versionchanged directives in docstrings for 0.18

indicate where exception classes were moved from

* moved versionadded in the proper places
paulha pushed a commit to paulha/scikit-learn that referenced this pull request Aug 19, 2017
@amueller @paulha
[MRG + 1] More versionadded everywhere! (scikit-learn#7403)
6987b07 
* insert versionadded versionchanged directives in docstrings for 0.18

indicate where exception classes were moved from

* moved versionadded in the proper places
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@amueller @jnothman @ogrisel @welch