Skip to content

[MRG] 0.22.2.post1 release branch #16609

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.

Sign up for GitHub

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 4 commits into from
Mar 4, 2020
Merged

[MRG] 0.22.2.post1 release branch #16609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6dbfc59
update scikit-learn version
jeremiedbb Mar 2, 2020
e1e1d0e
update date on web site front page
jeremiedbb Mar 2, 2020
3ca00fb
[MRG] Update What's new for 0.22.2.post1 (#16610)
jeremiedbb Mar 3, 2020
c38b64a
BLD Removes post from release on website (#16624)
thomasjpfan Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .binder/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ scikit-image==0.16.2
pandas==0.25.3
sphinx-gallery==0.5.0
# Need to update the scikit-learn version on each 0.22 minor release
scikit-learn==0.22.2
scikit-learn==0.22.2.post1

10 changes: 7 additions & 3 deletions doc/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,14 @@
#
# The short X.Y version.
import sklearn
version = parse(sklearn.__version__).base_version
version = ".".join(version.split(".")[:2])
parsed_version = parse(sklearn.__version__)
version = ".".join(parsed_version.base_version.split(".")[:2])
# The full version, including alpha/beta/rc tags.
release = sklearn.__version__
# Removes post from release name
if parsed_version.is_postrelease:
release = parsed_version.base_version
else:
release = sklearn.__version__

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ <h4 class="sk-landing-call-header">News</h4>
<li><strong>On-going development:</strong>
<a href="https://scikit-learn.org/dev/whats_new.html"><strong>What's new</strong> (Changelog)</a>
</li>
<li><strong>February 2020.</strong> scikit-learn 0.22.2 is available for download (<a href="whats_new/v0.22.html#version-0-22-2">Changelog</a>).
<li><strong>March 2020.</strong> scikit-learn 0.22.2 is available for download (<a href="whats_new/v0.22.html#version-0-22-2">Changelog</a>).
Copy link
Member Author

Choose a reason for hiding this comment

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

Should we say "scikit-learn 0.22.2.post1" here ?

Copy link
Member

Choose a reason for hiding this comment

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

I'm happy either way.

Copy link
Member

Choose a reason for hiding this comment

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

Let's not put post here. It may lead to confusion.

Copy link
Member

Choose a reason for hiding this comment

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

You could just say Fixed source distribution available from March

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry don't get what you're proposing. Can you make it as a suggestion ?

Copy link
Member

Choose a reason for hiding this comment

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

Sorry, I missed this ongoing discussion and already merged the PR. I believe this is fine as it is right?

Copy link
Member

Choose a reason for hiding this comment

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

We can always update the website after the 0.22.2.post1 release by pushing to 0.22.X after the tag anyway.

<li><strong>January 2020.</strong> scikit-learn 0.22.1 is available for download (<a href="whats_new/v0.22.html#version-0-22-1">Changelog</a>).
<li><strong>December 2019.</strong> scikit-learn 0.22 is available for download (<a href="whats_new/v0.22.html#version-0-22-0">Changelog</a>).
</li>
Expand Down
13 changes: 9 additions & 4 deletions doc/whats_new/v0.22.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@

.. _changes_0_22_2:

Version 0.22.2
==============
Version 0.22.2.post1
====================

**March 3 2020**

**February 28 2020**
The 0.22.2.post1 release includes a packaging fix for the source distribution
but the content of the packages is otherwise identical to the content of the
wheels with the 0.22.2 version (without the .post1 suffix). Both contain the
following changes.

Changelog
---------
Expand All @@ -33,7 +38,7 @@ Changelog
:class:`metrics.PrecisionRecallDisplay` instead of the parameter `name`. It
results in a different plot when calling
:meth:`metrics.PrecisionRecallDisplay.plot` for the subsequent times.
:pr:`#16505` by :user:`Guillaume Lemaitre <glemaitre>`.
:pr:`16505` by :user:`Guillaume Lemaitre <glemaitre>`.

:mod:`sklearn.neighbors`
..............................
Expand Down
2 changes: 1 addition & 1 deletion sklearn/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
# Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
# 'X.Y.dev0' is the canonical version of 'X.Y.dev'
#
__version__ = '0.22.2'
__version__ = '0.22.2.post1'


# On OSX, we can get a runtime error due to multiple OpenMP libraries loaded
Expand Down