From 158b5b5902c6c97f7a3710de589de01eb815da2c Mon Sep 17 00:00:00 2001 From: Benjamin Bengfort Date: Fri, 15 Jan 2021 10:54:13 -0500 Subject: [PATCH] Release candidate Hotfix 1.2.1 --- docs/changelog.rst | 10 ++++++++++ docs/requirements.txt | 4 ++-- requirements.txt | 4 ++-- tests/__init__.py | 2 +- tests/requirements.txt | 4 ++-- tests/test_contrib/test_missing/test_bar.py | 1 + tests/test_contrib/test_missing/test_dispersion.py | 2 ++ yellowbrick/version.py | 4 ++-- 8 files changed, 22 insertions(+), 9 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 4ffb5ba27..d7af7ecaa 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -3,6 +3,16 @@ Changelog ========= +Hotfix 1.2.1 +------------ + +* Tag: v1.2.1_ +* Deployed Friday, January 15, 2020 +* Contributors: Rebecca Bilbro, Benjamin Bengfort, Paul Johnson, Matt Harrison + +On December 22, 2020, scikit-learn released version 0.24 which deprecated the external use of scikit-learn's internal utilities such as ``safe_indexing``. Unfortunately, Yellowbrick depends on a few of these utilities and must refactor our internal code base to port this functionality or work around it. To ensure that Yellowbrick continues to work when installed via ``pip``, we have temporarily changed our scikit-learn dependency to be less than 0.24. We will update our dependencies on the v1.3 release when we have made the associated fixes. + + Version 1.2 ----------- diff --git a/docs/requirements.txt b/docs/requirements.txt index 866b06ebf..f6f35b5b5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,7 +1,7 @@ # Library Dependencies matplotlib>=3.0.2,!=3.1.1 -scipy>=1.0.0 -scikit-learn>=0.20 +scipy>=1.0.0,<1.6 +scikit-learn>=0.20,<0.24 numpy>=1.13.0 cycler>=0.10.0 diff --git a/requirements.txt b/requirements.txt index 6e0f3680c..eb60359e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ ## Dependencies matplotlib>=2.0.2,!=3.0.0 -scipy>=1.0.0 -scikit-learn>=0.20 +scipy>=1.0.0,<1.6 +scikit-learn>=0.20,<0.24 numpy>=1.13.0 cycler>=0.10.0 diff --git a/tests/__init__.py b/tests/__init__.py index ac99a9781..7e848bc95 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -27,7 +27,7 @@ ## Test Constants ########################################################################## -EXPECTED_VERSION = "1.2" +EXPECTED_VERSION = "1.2.1" ########################################################################## diff --git a/tests/requirements.txt b/tests/requirements.txt index 8eb66e424..32a2d3c97 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,7 +1,7 @@ # Library Dependencies matplotlib>=3.3 -scipy>=1.0.0 -scikit-learn>=0.20 +scipy>=1.0.0,<1.6 +scikit-learn>=0.20,<0.24 numpy>=1.13.0 cycler>=0.10.0 diff --git a/tests/test_contrib/test_missing/test_bar.py b/tests/test_contrib/test_missing/test_bar.py index e256006f8..c8d3b8aa9 100644 --- a/tests/test_contrib/test_missing/test_bar.py +++ b/tests/test_contrib/test_missing/test_bar.py @@ -47,6 +47,7 @@ class TestMissingBarVisualizer(VisualTestCase): FeatureImportances visualizer """ + @pytest.mark.skipif(pd is None, reason="pandas is required") def test_missingvaluesbar_pandas(self): """ Integration test of visualizer with pandas diff --git a/tests/test_contrib/test_missing/test_dispersion.py b/tests/test_contrib/test_missing/test_dispersion.py index 7db9a525a..084ad9cd3 100644 --- a/tests/test_contrib/test_missing/test_dispersion.py +++ b/tests/test_contrib/test_missing/test_dispersion.py @@ -47,6 +47,7 @@ class TestMissingValuesDispersion(VisualTestCase): MissingValuesDispersion visualizer """ + @pytest.mark.skipif(pd is None, reason="pandas is required") def test_missingvaluesdispersion_with_pandas(self): """ Integration test of visualizer with pandas @@ -72,6 +73,7 @@ def test_missingvaluesdispersion_with_pandas(self): self.assert_images_similar(viz, tol=self.tol) + @pytest.mark.skipif(pd is None, reason="pandas is required") def test_missingvaluesdispersion_with_pandas_with_y_targets(self): """ Integration test of visualizer with pandas with y targets diff --git a/yellowbrick/version.py b/yellowbrick/version.py index fb72e2027..3dd2e2503 100644 --- a/yellowbrick/version.py +++ b/yellowbrick/version.py @@ -20,10 +20,10 @@ __version_info__ = { "major": 1, "minor": 2, - "micro": 0, + "micro": 1, "releaselevel": "final", "post": 0, - "serial": 18, + "serial": 19, } ##########################################################################