From 6dbfc59467e0593067ec73857f4f7fa47bf473b4 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Mon, 2 Mar 2020 10:11:15 +0100 Subject: [PATCH 1/4] update scikit-learn version --- .binder/requirements.txt | 2 +- sklearn/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.binder/requirements.txt b/.binder/requirements.txt index db5dbe9c300d3..bb910dffea3f9 100644 --- a/.binder/requirements.txt +++ b/.binder/requirements.txt @@ -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 diff --git a/sklearn/__init__.py b/sklearn/__init__.py index 9edbd2723ffed..d3b9f03f626c7 100644 --- a/sklearn/__init__.py +++ b/sklearn/__init__.py @@ -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 From e1e1d0ec4c4998dd8ccc7d7a5253f2576c5d2466 Mon Sep 17 00:00:00 2001 From: jeremie du boisberranger Date: Mon, 2 Mar 2020 14:19:20 +0100 Subject: [PATCH 2/4] update date on web site front page --- doc/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/templates/index.html b/doc/templates/index.html index 1cf74b55f12a7..55da2d12ed530 100644 --- a/doc/templates/index.html +++ b/doc/templates/index.html @@ -156,7 +156,7 @@

News

  • On-going development: What's new (Changelog)
  • -
  • February 2020. scikit-learn 0.22.2 is available for download (Changelog). +
  • March 2020. scikit-learn 0.22.2 is available for download (Changelog).
  • January 2020. scikit-learn 0.22.1 is available for download (Changelog).
  • December 2019. scikit-learn 0.22 is available for download (Changelog).
  • From 3ca00fb9a94a9c6598f664cf9fccafa3c855de0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20du=20Boisberranger?= <34657725+jeremiedbb@users.noreply.github.com> Date: Tue, 3 Mar 2020 15:56:27 +0100 Subject: [PATCH 3/4] [MRG] Update What's new for 0.22.2.post1 (#16610) --- doc/whats_new/v0.22.rst | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/doc/whats_new/v0.22.rst b/doc/whats_new/v0.22.rst index 69afe2494463b..fa8593dd07ea4 100644 --- a/doc/whats_new/v0.22.rst +++ b/doc/whats_new/v0.22.rst @@ -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 --------- @@ -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 `. + :pr:`16505` by :user:`Guillaume Lemaitre `. :mod:`sklearn.neighbors` .............................. From c38b64ae532f5818574aff89713966053706b5a6 Mon Sep 17 00:00:00 2001 From: Thomas J Fan Date: Tue, 3 Mar 2020 15:52:43 -0500 Subject: [PATCH 4/4] BLD Removes post from release on website (#16624) --- doc/conf.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index e3ccf62c2166e..b7eb635b15f40 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -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.