Skip to content
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

DOC some more fixes for changelog preparing release 1.1.1 #23420

Merged
merged 3 commits into from May 19, 2022

Conversation

glemaitre
Copy link
Member

It seems that these entries are in 1.1.0 but I actually backported them in 1.1.1

@glemaitre glemaitre added the To backport PR merged in master that need a backport to a release branch defined based on the milestone. label May 19, 2022
@glemaitre glemaitre changed the title DOC move some entries from 1.1.0 to 1.1.1 DOC some more fixes for changelog preparing release 1.1.1 May 19, 2022
@@ -234,17 +245,6 @@ Changelog
:func:`sklearn.set_config`.
:pr:`22856` by :user:`Jérémie du Boisberranger <jeremiedbb>`.

- |Enhancement| The error message is improved when importing
Copy link
Member Author

Choose a reason for hiding this comment

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

I don't really understand why they appear here since they are not part of 1.1.0

Copy link
Member

Choose a reason for hiding this comment

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

they must have been merged after I made the PR for the RC and not marked as "to backport"

Copy link
Member Author

Choose a reason for hiding this comment

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

Make sense

@@ -12,6 +12,17 @@ Version 1.1.1
Changelog
---------

- |Enhancement| The error message is improved when importing
Copy link
Member Author

Choose a reason for hiding this comment

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

I move them to 1.1.1 because they are not part of 1.1.0
Even if they are categorized as "Enhancement", they are more documentation and error message fixing.

I think this is fine to put them in the bugfix release.

Copy link
Member

Choose a reason for hiding this comment

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

Well since we already advertised them in the changelog I think it's ok to include them in the bug fix release.

@glemaitre
Copy link
Member Author

ping @jeremiedbb

@glemaitre glemaitre merged commit 3790d5c into scikit-learn:main May 19, 2022
@glemaitre
Copy link
Member Author

The rendering is fine. Let's backport once the ci build finished

glemaitre added a commit to glemaitre/scikit-learn that referenced this pull request May 19, 2022
lesteve pushed a commit to lesteve/scikit-learn that referenced this pull request May 19, 2022
mathijs02 pushed a commit to mathijs02/scikit-learn that referenced this pull request Dec 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation To backport PR merged in master that need a backport to a release branch defined based on the milestone.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants